Commit a287c1fa authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by yingbao jia
Browse files

platform/x86: ISST: Fix optimization with use of numa 

mainline inclusion
from mainline-5.15
commit d36d4a1d
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6FY06
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d36d4a1d75d2a8bd14ec00d5cb0ce166f6886146



Intel-SIG: commit d36d4a1d platform/x86: ISST: Fix optimization with use of numa.
Backport for ISST driver fix

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

When numa is used to map CPU to PCI device, the optimized path to read
from cached data is not working and still calls _isst_if_get_pci_dev().

The reason is that when caching the mapping, numa information is not
available as it is read later. So move the assignment of
isst_cpu_info[cpu].numa_node before calling _isst_if_get_pci_dev().

Fixes: aa2ddd24 ("platform/x86: ISST: Use numa node id for cpu pci dev mapping")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20210727165052.427238-1-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avataryingbao jia <yingbao.jia@intel.com>
parent 709b93da

drivers/platform/x86/intel_speed_select_if/isst_if_common.c

+2 −1
Original line number Diff line number Diff line
@@ -379,6 +379,8 @@ static int isst_if_cpu_online(unsigned int cpu) 
	u64 data;

	int ret;



	isst_cpu_info[cpu].numa_node = cpu_to_node(cpu);



	ret = rdmsrl_safe(MSR_CPU_BUS_NUMBER, &data);

	if (ret) {

		/* This is not a fatal error on MSR mailbox only I/F */
@@ -397,7 +399,6 @@ static int isst_if_cpu_online(unsigned int cpu) 
		return ret;

	}

	isst_cpu_info[cpu].punit_cpu_id = data;

	isst_cpu_info[cpu].numa_node = cpu_to_node(cpu);



	isst_restore_msr_local(cpu);