Commit d36d4a1d authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Hans de Goede

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

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.comSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent e184b1e5
...@@ -379,6 +379,8 @@ static int isst_if_cpu_online(unsigned int cpu) ...@@ -379,6 +379,8 @@ static int isst_if_cpu_online(unsigned int cpu)
u64 data; u64 data;
int ret; int ret;
isst_cpu_info[cpu].numa_node = cpu_to_node(cpu);
ret = rdmsrl_safe(MSR_CPU_BUS_NUMBER, &data); ret = rdmsrl_safe(MSR_CPU_BUS_NUMBER, &data);
if (ret) { if (ret) {
/* This is not a fatal error on MSR mailbox only I/F */ /* 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) ...@@ -397,7 +399,6 @@ static int isst_if_cpu_online(unsigned int cpu)
return ret; return ret;
} }
isst_cpu_info[cpu].punit_cpu_id = data; isst_cpu_info[cpu].punit_cpu_id = data;
isst_cpu_info[cpu].numa_node = cpu_to_node(cpu);
isst_restore_msr_local(cpu); isst_restore_msr_local(cpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment