x86/amd_nb, hwmon: (k10temp): Simplify amd_pci_dev_to_node_id()

amd_pci_dev_to_node_id() tries to find the AMD node ID of a device by
searching and counting devices.

The AMD node ID of an AMD node device is simply its slot number minus
the AMD node 0 slot number.

Simplify this function and move it to k10temp.c.

  [ Yazen: Update commit message and simplify function. ]

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Co-developed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241206161210.163701-10-yazen.ghannam@amd.com

diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index b48dc6975da27b9fbd09015ce61f7d62080b9729..094c3be81a8df17877c054f5f91c5e1d8ca0fd1b 100644 (file)
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -82,23 +82,6 @@ u16 amd_nb_num(void);
 bool amd_nb_has_feature(unsigned int feature);
 struct amd_northbridge *node_to_amd_nb(int node);
 
-static inline u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)
-{
-       struct pci_dev *misc;
-       int i;
-
-       for (i = 0; i != amd_nb_num(); i++) {
-               misc = node_to_amd_nb(i)->misc;
-
-               if (pci_domain_nr(misc->bus) == pci_domain_nr(pdev->bus) &&
-                   PCI_SLOT(misc->devfn) == PCI_SLOT(pdev->devfn))
-                       return i;
-       }
-
-       WARN(1, "Unable to find AMD Northbridge id for %s\n", pci_name(pdev));
-       return 0;
-}
-
 static inline bool amd_gart_present(void)
 {
        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 7dc19c5d62ac3581a7da9ca63897839351d3b09b..cefa8cd184c8bbd06906bb8ed4f5811f0a0a02af 100644 (file)
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -150,6 +150,11 @@ static void read_tempreg_nb_f15(struct pci_dev *pdev, u32 *regval)
                          F15H_M60H_REPORTED_TEMP_CTRL_OFFSET, regval);
 }
 
+static u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)
+{
+       return PCI_SLOT(pdev->devfn) - AMD_NODE0_PCI_SLOT;
+}
+
 static void read_tempreg_nb_zen(struct pci_dev *pdev, u32 *regval)
 {
        if (amd_smn_read(amd_pci_dev_to_node_id(pdev),