[tip: x86/core] scsi: lpfc: Use topology_core_id()

From: tip-bot2 for Thomas Gleixner
Date: Fri Oct 13 2023 - 05:39:05 EST


The following commit has been merged into the x86/core branch of tip:

Commit-ID: 09253672b5d9f911b96651400a02ad6666b7ae2c
Gitweb: https://git.kernel.org/tip/09253672b5d9f911b96651400a02ad6666b7ae2c
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 14 Aug 2023 10:18:32 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 10 Oct 2023 14:38:17 +02:00

scsi: lpfc: Use topology_core_id()

Use the provided topology helper.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Juergen Gross <jgross@xxxxxxxx>
Tested-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
Tested-by: Michael Kelley <mikelley@xxxxxxxxxxxxx>
Tested-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Tested-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230814085112.446856860@xxxxxxxxxxxxx

---
drivers/scsi/lpfc/lpfc_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 3543772..e7c47ee 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -12456,7 +12456,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors)
cpup = &phba->sli4_hba.cpu_map[cpu];
#ifdef CONFIG_X86
cpup->phys_id = topology_physical_package_id(cpu);
- cpup->core_id = cpuinfo->cpu_core_id;
+ cpup->core_id = topology_core_id(cpu);
if (lpfc_find_hyper(phba, cpu, cpup->phys_id, cpup->core_id))
cpup->flag |= LPFC_CPU_MAP_HYPER;
#else