Unverified Commit 0581d384 authored by Suma Hegde's avatar Suma Hegde Committed by Ilpo Järvinen
Browse files

platform/x86/amd/hsmp: Make amd_hsmp and hsmp_acpi as mutually exclusive drivers 

amd_hsmp and hsmp_acpi are intended to be mutually exclusive drivers and
amd_hsmp is for legacy platforms. To achieve this, it is essential to
check for the presence of the ACPI device in plat.c. If the hsmp ACPI
device entry is found, allow the hsmp_acpi driver to manage the hsmp
and return an error from plat.c.

Additionally, rename the driver from amd_hsmp to hsmp_acpi to prevent
"Driver 'amd_hsmp' is already registered, aborting..." error in case
both drivers are loaded simultaneously.

Also, support both platform device based and ACPI based probing for
family 0x1A models 0x00 to 0x0F, implement only ACPI based probing
for family 0x1A, models 0x10 to 0x1F. Return false from
legacy_hsmp_support() for this platform.
This aligns with the condition check in is_f1a_m0h().

Link: https://lore.kernel.org/platform-driver-x86/aALZxvHWmphNL1wa@gourry-fedora-PF4VCD3F/


Fixes: 7d3135d1 ("platform/x86/amd/hsmp: Create separate ACPI, plat and common drivers")
Reviewed-by: default avatarNaveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Co-developed-by: default avatarGregory Price <gourry@gourry.net>
Signed-off-by: default avatarGregory Price <gourry@gourry.net>
Signed-off-by: default avatarSuma Hegde <suma.hegde@amd.com>
Link: https://lore.kernel.org/r/20250425102357.266790-1-suma.hegde@amd.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 8e81b9cd

drivers/platform/x86/amd/hsmp/acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ 


#include "hsmp.h"



#define DRIVER_NAME		"amd_hsmp"

#define DRIVER_NAME		"hsmp_acpi"

#define DRIVER_VERSION		"2.3"

#define ACPI_HSMP_DEVICE_HID	"AMDI0097"



/* These are the strings specified in ACPI table */

#define MSG_IDOFF_STR		"MsgIdOffset"

drivers/platform/x86/amd/hsmp/hsmp.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#define HSMP_CDEV_NAME		"hsmp_cdev"

#define HSMP_DEVNODE_NAME	"hsmp"

#define ACPI_HSMP_DEVICE_HID    "AMDI0097"



struct hsmp_mbaddr_info {

	u32 base_addr;

drivers/platform/x86/amd/hsmp/plat.c

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <asm/amd_hsmp.h>



#include <linux/acpi.h>

#include <linux/build_bug.h>

#include <linux/device.h>

#include <linux/module.h>
@@ -266,7 +267,7 @@ static bool legacy_hsmp_support(void) 
		}

	case 0x1A:

		switch (boot_cpu_data.x86_model) {

		case 0x00 ... 0x1F:

		case 0x00 ... 0x0F:

			return true;

		default:

			return false;
@@ -288,6 +289,9 @@ static int __init hsmp_plt_init(void) 
		return ret;

	}



	if (acpi_dev_present(ACPI_HSMP_DEVICE_HID, NULL, -1))

		return -ENODEV;



	hsmp_pdev = get_hsmp_pdev();

	if (!hsmp_pdev)

		return -ENOMEM;