Commit 1daa90d3 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jia, Yingbao
Browse files

platform/x86: ISST: Avoid some SkyLake server models 

mainline inclusion
from mainline-v6.11
commit 3ea025fb4b5f1a0b66df25eba50b2a1071f01080
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QD3
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3ea025fb4b5f1a0b66df25eba50b2a1071f01080



-------------------------------------------------

Intel-SIG: commit 3ea025fb4b5f platform/x86: ISST: Avoid some SkyLake server models.
Backport Intel speed select ISST driver bugfix from upstream 6.11.

Some SkyLake server variants don't support any SST functionality. No use
of providing any SST related interfaces on them.

All supported SkyLake servers provide mailbox interface via MSR. So check
for the presence of MSR 0xB0 and 0xB1. If not present don't load common
module.

Move defines for MSR_OS_MAILBOX_INTERFACE and MSR_OS_MAILBOX_DATA to
common header file to avoid duplicating them.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20240531083554.1313110-3-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent d41e3129

drivers/platform/x86/intel_speed_select_if/isst_if_common.c

+11 −2
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ void isst_if_cdev_unregister(int device_type) 
EXPORT_SYMBOL_GPL(isst_if_cdev_unregister);



#define SST_HPM_SUPPORTED	0x01

#define SST_MBOX_SUPPORTED	0x02



static const struct x86_cpu_id isst_cpu_ids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT,	SST_HPM_SUPPORTED),
@@ -826,7 +827,7 @@ static const struct x86_cpu_id isst_cpu_ids[] = { 
	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	0),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,		0),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,		SST_MBOX_SUPPORTED),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, isst_cpu_ids);
@@ -839,8 +840,16 @@ static int __init isst_if_common_init(void) 
	if (!id)

		return -ENODEV;



	if (id->driver_data == SST_HPM_SUPPORTED)

	if (id->driver_data == SST_HPM_SUPPORTED) {

		isst_hpm_support = true;

	} else if (id->driver_data == SST_MBOX_SUPPORTED) {

		u64 data;



		/* Can fail only on some Skylake-X generations */

		if (rdmsrl_safe(MSR_OS_MAILBOX_INTERFACE, &data) ||

		    rdmsrl_safe(MSR_OS_MAILBOX_DATA, &data))

			return -ENODEV;

	}



	return isst_misc_reg();

}

drivers/platform/x86/intel_speed_select_if/isst_if_common.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#define PCI_DEVICE_ID_INTEL_RAPL_PRIO_DEVID_1	0x3251

#define PCI_DEVICE_ID_INTEL_CFG_MBOX_DEVID_1	0x3259



#define MSR_OS_MAILBOX_INTERFACE		0xB0

#define MSR_OS_MAILBOX_DATA			0xB1



/*

 * Validate maximum commands in a single request.

 * This is enough to handle command to every core in one ioctl, or all

drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#include "isst_if_common.h"



#define MSR_OS_MAILBOX_INTERFACE	0xB0

#define MSR_OS_MAILBOX_DATA		0xB1

#define MSR_OS_MAILBOX_BUSY_BIT		31



/*