x86/amd_nb, char/amd64-agp: Use amd_nb_num() accessor
authorBorislav Petkov <bp@suse.de>
Mon, 16 Mar 2020 12:23:21 +0000 (13:23 +0100)
committerBorislav Petkov <bp@suse.de>
Tue, 17 Mar 2020 09:25:58 +0000 (10:25 +0100)
... to find whether there are northbridges present on the
system. Convert the last forgotten user and therefore, unexport
amd_nb_misc_ids[] too.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Michal Kubecek <mkubecek@suse.cz>
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lkml.kernel.org/r/20200316150725.925-1-bp@alien8.de
arch/x86/include/asm/amd_nb.h
arch/x86/kernel/amd_nb.c
drivers/char/agp/amd64-agp.c

index 1ae4e57..c7df20e 100644 (file)
@@ -12,7 +12,6 @@ struct amd_nb_bus_dev_range {
        u8 dev_limit;
 };
 
-extern const struct pci_device_id amd_nb_misc_ids[];
 extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
 
 extern bool early_is_amd_nb(u32 value);
index 69aed0e..b6b3297 100644 (file)
@@ -36,10 +36,9 @@ static const struct pci_device_id amd_root_ids[] = {
        {}
 };
 
-
 #define PCI_DEVICE_ID_AMD_CNB17H_F4     0x1704
 
-const struct pci_device_id amd_nb_misc_ids[] = {
+static const struct pci_device_id amd_nb_misc_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
@@ -56,7 +55,6 @@ const struct pci_device_id amd_nb_misc_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
        {}
 };
-EXPORT_SYMBOL_GPL(amd_nb_misc_ids);
 
 static const struct pci_device_id amd_nb_link_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
index 594aee2..b40edae 100644 (file)
@@ -775,7 +775,7 @@ int __init agp_amd64_init(void)
                }
 
                /* First check that we have at least one AMD64 NB */
-               if (!pci_dev_present(amd_nb_misc_ids)) {
+               if (!amd_nb_num()) {
                        pci_unregister_driver(&agp_amd64_pci_driver);
                        return -ENODEV;
                }