| Message ID | 20140419025345.2408.99229.stgit@amt.stowe |
|---|---|
| State | Changes Requested |
| Headers | show |
On Fri, Apr 18, 2014 at 08:53:46PM -0600, Myron Stowe wrote: > With the amd_bus.c updates to support additional AMD processors (11h, 12h, > 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This patch > removes it. > > Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Good idea. Has this been tested, though? There are a bunch of places using dev_to_node() which this quirk corrects, especially 'local_cpus' in a bunch of sysfs nodes in the PCI hierarchy /sys/devices/pci*. We want to make sure this doesn't break that and other dev_to_node() callsites. Thanks.
On Sun, Apr 20, 2014 at 4:54 AM, Borislav Petkov <bp@suse.de> wrote: > On Fri, Apr 18, 2014 at 08:53:46PM -0600, Myron Stowe wrote: >> With the amd_bus.c updates to support additional AMD processors (11h, 12h, >> 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This patch >> removes it. >> >> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> > > Good idea. Has this been tested, though? There are a bunch of places > using dev_to_node() which this quirk corrects, especially 'local_cpus' > in a bunch of sysfs nodes in the PCI hierarchy /sys/devices/pci*. Borislav: Thanks for the review, suggestions, and comments. Just and FYI - I'll be gone until late in this coming week on a backpacking trip in remote Utah. I'll work your suggestions when I get back. With respect to this patch and testing. Yes, I did test and it worked for my situation. I would like to hear from Daniel as I'm not exactly sure what his last change was specific to. Daniel: with the previous patches in this series applied do you still need this quirk for your situation? Thanks, Myron > > We want to make sure this doesn't break that and other dev_to_node() > callsites. Agreed > > Thanks. > > -- > Regards/Gruss, > Boris. > > Sent from a fat crate under my desk. Formatting is fine. > -- > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Myron, On 04/20/2014 09:44 PM, Myron Stowe wrote: > On Sun, Apr 20, 2014 at 4:54 AM, Borislav Petkov <bp@suse.de> wrote: >> On Fri, Apr 18, 2014 at 08:53:46PM -0600, Myron Stowe wrote: >>> With the amd_bus.c updates to support additional AMD processors (11h, 12h, >>> 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This patch >>> removes it. >>> >>> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> >> >> Good idea. Has this been tested, though? There are a bunch of places >> using dev_to_node() which this quirk corrects, especially 'local_cpus' >> in a bunch of sysfs nodes in the PCI hierarchy /sys/devices/pci*. > > Borislav: > > Thanks for the review, suggestions, and comments. > > Just and FYI - I'll be gone until late in this coming week on a > backpacking trip in remote Utah. I'll work your suggestions when I > get back. > > With respect to this patch and testing. Yes, I did test and it worked > for my situation. I would like to hear from Daniel as I'm not exactly > sure what his last change was specific to. > > Daniel: with the previous patches in this series applied do you still > need this quirk for your situation? It's fine enough for us, since we'll always emit a PXM method for any PCI host bridges (but roots), which gets correctly preserved with your patches [1]. I don't have reason to suspect northbridges at bus 0, devices 0x19 and later in each PCI domain having the wrong NUMA node is going to cause any issues. We could improve things by changing probe_pci_hostbridge to iterate all PCI bus domains, but it's probably not a big deal to bail with one warning, as we currently see multiple (which would become a lot on most of our systems): [ 3.155974] AMD-Bus: TOM: 00000000d8000000 aka 3456M [ 3.160003] [ 3.161496] AMD-Bus: WARNING: Failed to find root info for node 0x4, link 0x0 [ 3.168625] [ 3.170002] [ 3.171492] AMD-Bus: WARNING: Failed to find root info for node 0x4, link 0x0 [ 3.178614] AMD-Bus: WARNING: Failed to find root info for node 0x4, link 0x0 [ 3.180003] AMD-Bus: TOM2: 0000001900000000 aka 102400M Thanks, Daniel -- [1] (two server NumaConnect system) # lspci 0000:00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part (rev 02) 0000:00:0d.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 PCI to PCI bridge (external gfx1 port B) 0000:00:11.0 SATA controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode] 0000:00:12.0 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 0000:00:12.1 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0 USB OHCI1 Controller 0000:00:12.2 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 USB EHCI Controller 0000:00:13.0 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 0000:00:13.1 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0 USB OHCI1 Controller 0000:00:13.2 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 USB EHCI Controller 0000:00:14.0 SMBus: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 SMBus Controller (rev 3d) 0000:00:14.1 IDE interface: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 IDE Controller 0000:00:14.3 ISA bridge: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 LPC host controller 0000:00:14.4 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 PCI to PCI Bridge 0000:00:14.5 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 USB OHCI2 Controller 0000:00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0000:00:18.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0000:00:18.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0000:00:18.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0000:00:18.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0000:00:18.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0000:00:19.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0000:00:19.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0000:00:19.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0000:00:19.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0000:00:19.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0000:00:19.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0000:00:1a.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0000:00:1a.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0000:00:1a.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0000:00:1a.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0000:00:1a.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0000:00:1a.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0000:00:1b.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0000:00:1b.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0000:00:1b.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0000:00:1b.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0000:00:1b.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0000:00:1b.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0000:00:1c.0 Host bridge: Numascale AS NumaChip N601 (rev 02) 0000:00:1c.1 Host bridge: Numascale AS NumaChip N602 (rev 02) 0000:01:04.0 VGA compatible controller: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 (rev 0a) 0000:02:00.0 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 0000:02:00.1 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 0001:00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part (rev 02) 0001:00:0d.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 PCI to PCI bridge (external gfx1 port B) 0001:00:11.0 SATA controller: Advanced Micro Devices, Inc. [AMD/ATI] SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode] 0001:00:14.0 ISA bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 SMBus Controller (rev 3d) 0001:00:14.4 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 PCI to PCI Bridge 0001:00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0001:00:18.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0001:00:18.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0001:00:18.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0001:00:18.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0001:00:18.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0001:00:19.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0001:00:19.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0001:00:19.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0001:00:19.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0001:00:19.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0001:00:19.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0001:00:1a.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0001:00:1a.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0001:00:1a.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0001:00:1a.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0001:00:1a.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0001:00:1a.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0001:00:1b.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 0 0001:00:1b.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 1 0001:00:1b.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 2 0001:00:1b.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 3 0001:00:1b.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 4 0001:00:1b.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h Processor Function 5 0001:00:1c.0 Host bridge: Numascale AS NumaChip N601 (rev 02) 0001:00:1c.1 Host bridge: Numascale AS NumaChip N602 (rev 02) 0001:02:00.0 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 0001:02:00.1 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) # find /sys/devices/pci* -name numa_node -print -exec cat {} \; /sys/devices/pci0000:00/0000:00:00.0/numa_node 0 /sys/devices/pci0000:00/0000:00:11.0/numa_node 0 /sys/devices/pci0000:00/0000:00:12.0/numa_node 0 /sys/devices/pci0000:00/0000:00:12.1/numa_node 0 /sys/devices/pci0000:00/0000:00:12.2/numa_node 0 /sys/devices/pci0000:00/0000:00:13.0/numa_node 0 /sys/devices/pci0000:00/0000:00:13.1/numa_node 0 /sys/devices/pci0000:00/0000:00:13.2/numa_node 0 /sys/devices/pci0000:00/0000:00:14.0/numa_node 0 /sys/devices/pci0000:00/0000:00:14.1/numa_node 0 /sys/devices/pci0000:00/0000:00:14.3/numa_node 0 /sys/devices/pci0000:00/0000:00:14.4/0000:01:04.0/numa_node 0 /sys/devices/pci0000:00/0000:00:14.4/numa_node 0 /sys/devices/pci0000:00/0000:00:14.5/numa_node 0 /sys/devices/pci0000:00/0000:00:18.0/numa_node 0 /sys/devices/pci0000:00/0000:00:18.1/numa_node 0 /sys/devices/pci0000:00/0000:00:18.2/numa_node 0 /sys/devices/pci0000:00/0000:00:18.3/numa_node 0 /sys/devices/pci0000:00/0000:00:18.4/numa_node 0 /sys/devices/pci0000:00/0000:00:18.5/numa_node 0 /sys/devices/pci0000:00/0000:00:19.0/numa_node 0 /sys/devices/pci0000:00/0000:00:19.1/numa_node 0 /sys/devices/pci0000:00/0000:00:19.2/numa_node 0 /sys/devices/pci0000:00/0000:00:19.3/numa_node 0 /sys/devices/pci0000:00/0000:00:19.4/numa_node 0 /sys/devices/pci0000:00/0000:00:19.5/numa_node 0 /sys/devices/pci0000:00/0000:00:0d.0/0000:02:00.0/numa_node 0 /sys/devices/pci0000:00/0000:00:0d.0/0000:02:00.1/numa_node 0 /sys/devices/pci0000:00/0000:00:0d.0/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.0/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.1/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.2/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.3/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.4/numa_node 0 /sys/devices/pci0000:00/0000:00:1a.5/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.0/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.1/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.2/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.3/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.4/numa_node 0 /sys/devices/pci0000:00/0000:00:1b.5/numa_node 0 /sys/devices/pci0000:00/0000:00:1c.0/numa_node 0 /sys/devices/pci0000:00/0000:00:1c.1/numa_node 0 /sys/devices/pci0001:00/0001:00:00.0/numa_node 4 /sys/devices/pci0001:00/0001:00:11.0/numa_node 4 /sys/devices/pci0001:00/0001:00:14.0/numa_node 4 /sys/devices/pci0001:00/0001:00:14.4/numa_node 4 /sys/devices/pci0001:00/0001:00:18.0/numa_node 4 /sys/devices/pci0001:00/0001:00:18.1/numa_node 4 /sys/devices/pci0001:00/0001:00:18.2/numa_node 4 /sys/devices/pci0001:00/0001:00:18.3/numa_node 4 /sys/devices/pci0001:00/0001:00:18.4/numa_node 4 /sys/devices/pci0001:00/0001:00:18.5/numa_node 4 /sys/devices/pci0001:00/0001:00:19.0/numa_node 4 /sys/devices/pci0001:00/0001:00:19.1/numa_node 4 /sys/devices/pci0001:00/0001:00:19.2/numa_node 4 /sys/devices/pci0001:00/0001:00:19.3/numa_node 4 /sys/devices/pci0001:00/0001:00:19.4/numa_node 4 /sys/devices/pci0001:00/0001:00:19.5/numa_node 4 /sys/devices/pci0001:00/0001:00:0d.0/0001:02:00.0/numa_node 4 /sys/devices/pci0001:00/0001:00:0d.0/0001:02:00.1/numa_node 4 /sys/devices/pci0001:00/0001:00:0d.0/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.0/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.1/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.2/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.3/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.4/numa_node 4 /sys/devices/pci0001:00/0001:00:1a.5/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.0/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.1/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.2/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.3/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.4/numa_node 4 /sys/devices/pci0001:00/0001:00:1b.5/numa_node 4 /sys/devices/pci0001:00/0001:00:1c.0/numa_node 4 /sys/devices/pci0001:00/0001:00:1c.1/numa_node 4
On Sun, Apr 20, 2014 at 4:54 AM, Borislav Petkov <bp@suse.de> wrote: > On Fri, Apr 18, 2014 at 08:53:46PM -0600, Myron Stowe wrote: >> With the amd_bus.c updates to support additional AMD processors (11h, 12h, >> 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This patch >> removes it. >> >> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> > > Good idea. Has this been tested, though? There are a bunch of places > using dev_to_node() which this quirk corrects, especially 'local_cpus' > in a bunch of sysfs nodes in the PCI hierarchy /sys/devices/pci*. My testing was related to the PCI hierarchy /sys/devices/pci* as this was the root issue I'm trying to get resolved. Daniel also responded - Thanks Dan! - indicating that the changes are ok related to his concerns. > > We want to make sure this doesn't break that and other dev_to_node() > callsites. Agreed, which is at least in part why this is a separate patch. I'm going to run some more testing and then post with most of your comments incorporated. Thanks again for the review. Myron > > Thanks. > > -- > Regards/Gruss, > Boris. > > Sent from a fat crate under my desk. Formatting is fine. > -- > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 4/21/2014 11:53 AM, Daniel J Blueman wrote: > Hi Myron, > > On 04/20/2014 09:44 PM, Myron Stowe wrote: >> On Sun, Apr 20, 2014 at 4:54 AM, Borislav Petkov <bp@suse.de> wrote: >>> On Fri, Apr 18, 2014 at 08:53:46PM -0600, Myron Stowe wrote: >>>> With the amd_bus.c updates to support additional AMD processors >>>> (11h, 12h, >>>> 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This >>>> patch >>>> removes it. >>>> >>>> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> >>> >>> Good idea. Has this been tested, though? There are a bunch of places >>> using dev_to_node() which this quirk corrects, especially 'local_cpus' >>> in a bunch of sysfs nodes in the PCI hierarchy /sys/devices/pci*. >> >> Borislav: >> >> Thanks for the review, suggestions, and comments. >> >> Just and FYI - I'll be gone until late in this coming week on a >> backpacking trip in remote Utah. I'll work your suggestions when I >> get back. >> >> With respect to this patch and testing. Yes, I did test and it worked >> for my situation. I would like to hear from Daniel as I'm not exactly >> sure what his last change was specific to. >> >> Daniel: with the previous patches in this series applied do you still >> need this quirk for your situation? > > It's fine enough for us, since we'll always emit a PXM method for any > PCI host bridges (but roots), which gets correctly preserved with your > patches [1]. I don't have reason to suspect northbridges at bus 0, > devices 0x19 and later in each PCI domain having the wrong NUMA node is > going to cause any issues. > > We could improve things by changing probe_pci_hostbridge to iterate all > PCI bus domains, but it's probably not a big deal to bail with one > warning, as we currently see multiple (which would become a lot on most > of our systems): > > [ 3.155974] AMD-Bus: TOM: 00000000d8000000 aka 3456M > [ 3.160003] > [ 3.161496] AMD-Bus: WARNING: Failed to find root info for node 0x4, > link 0x0 > [ 3.168625] > [ 3.170002] > [ 3.171492] AMD-Bus: WARNING: Failed to find root info for node 0x4, > link 0x0 > [ 3.178614] AMD-Bus: WARNING: Failed to find root info for node 0x4, > link 0x0 > [ 3.180003] AMD-Bus: TOM2: 0000001900000000 aka 102400M > > Thanks, > Daniel > > -- [1] (two server NumaConnect system) > > # lspci > 0000:00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 > Northbridge only dual slot (2x16) PCI-e GFX Hydra part (rev 02) > 0000:00:0d.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 > PCI to PCI bridge (external gfx1 port B) > 0000:00:11.0 SATA controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode] > 0000:00:12.0 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 USB OHCI0 Controller > 0000:00:12.1 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0 USB OHCI1 Controller > 0000:00:12.2 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 USB EHCI Controller > 0000:00:13.0 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 USB OHCI0 Controller > 0000:00:13.1 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0 USB OHCI1 Controller > 0000:00:13.2 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 USB EHCI Controller > 0000:00:14.0 SMBus: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 SMBus > Controller (rev 3d) > 0000:00:14.1 IDE interface: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 IDE Controller > 0000:00:14.3 ISA bridge: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 LPC host controller > 0000:00:14.4 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 > PCI to PCI Bridge > 0000:00:14.5 USB controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 USB OHCI2 Controller > 0000:00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0000:00:18.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0000:00:18.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0000:00:18.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0000:00:18.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0000:00:18.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0000:00:19.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0000:00:19.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0000:00:19.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0000:00:19.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0000:00:19.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0000:00:19.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0000:00:1a.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0000:00:1a.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0000:00:1a.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0000:00:1a.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0000:00:1a.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0000:00:1a.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0000:00:1b.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0000:00:1b.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0000:00:1b.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0000:00:1b.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0000:00:1b.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0000:00:1b.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0000:00:1c.0 Host bridge: Numascale AS NumaChip N601 (rev 02) > 0000:00:1c.1 Host bridge: Numascale AS NumaChip N602 (rev 02) > 0000:01:04.0 VGA compatible controller: Matrox Electronics Systems Ltd. > MGA G200eW WPCM450 (rev 0a) > 0000:02:00.0 Ethernet controller: Intel Corporation 82576 Gigabit > Network Connection (rev 01) > 0000:02:00.1 Ethernet controller: Intel Corporation 82576 Gigabit > Network Connection (rev 01) > 0001:00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 > Northbridge only dual slot (2x16) PCI-e GFX Hydra part (rev 02) > 0001:00:0d.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] RD890 > PCI to PCI bridge (external gfx1 port B) > 0001:00:11.0 SATA controller: Advanced Micro Devices, Inc. [AMD/ATI] > SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode] > 0001:00:14.0 ISA bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 > SMBus Controller (rev 3d) > 0001:00:14.4 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] SBx00 > PCI to PCI Bridge > 0001:00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0001:00:18.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0001:00:18.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0001:00:18.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0001:00:18.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0001:00:18.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0001:00:19.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0001:00:19.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0001:00:19.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0001:00:19.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0001:00:19.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0001:00:19.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0001:00:1a.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0001:00:1a.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0001:00:1a.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0001:00:1a.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0001:00:1a.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0001:00:1a.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0001:00:1b.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 0 > 0001:00:1b.1 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 1 > 0001:00:1b.2 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 2 > 0001:00:1b.3 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 3 > 0001:00:1b.4 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 4 > 0001:00:1b.5 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 15h > Processor Function 5 > 0001:00:1c.0 Host bridge: Numascale AS NumaChip N601 (rev 02) > 0001:00:1c.1 Host bridge: Numascale AS NumaChip N602 (rev 02) > 0001:02:00.0 Ethernet controller: Intel Corporation 82576 Gigabit > Network Connection (rev 01) > 0001:02:00.1 Ethernet controller: Intel Corporation 82576 Gigabit > Network Connection (rev 01) > > # find /sys/devices/pci* -name numa_node -print -exec cat {} \; > /sys/devices/pci0000:00/0000:00:00.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:11.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:12.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:12.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:12.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:13.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:13.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:13.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.3/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.4/0000:01:04.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.4/numa_node > 0 > /sys/devices/pci0000:00/0000:00:14.5/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.3/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.4/numa_node > 0 > /sys/devices/pci0000:00/0000:00:18.5/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.3/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.4/numa_node > 0 > /sys/devices/pci0000:00/0000:00:19.5/numa_node > 0 > /sys/devices/pci0000:00/0000:00:0d.0/0000:02:00.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:0d.0/0000:02:00.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:0d.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.3/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.4/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1a.5/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.1/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.2/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.3/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.4/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1b.5/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1c.0/numa_node > 0 > /sys/devices/pci0000:00/0000:00:1c.1/numa_node > 0 > /sys/devices/pci0001:00/0001:00:00.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:11.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:14.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:14.4/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.1/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.2/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.3/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.4/numa_node > 4 > /sys/devices/pci0001:00/0001:00:18.5/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.1/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.2/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.3/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.4/numa_node > 4 > /sys/devices/pci0001:00/0001:00:19.5/numa_node > 4 > /sys/devices/pci0001:00/0001:00:0d.0/0001:02:00.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:0d.0/0001:02:00.1/numa_node > 4 > /sys/devices/pci0001:00/0001:00:0d.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.1/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.2/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.3/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.4/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1a.5/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.1/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.2/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.3/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.4/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1b.5/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1c.0/numa_node > 4 > /sys/devices/pci0001:00/0001:00:1c.1/numa_node > 4 Sorry for late reply. My concern is that removing the "quirk_amd_nb_node()" will affect the value of "numa_node" of the host bridge devices (i.e. X:00.[18|19|1a|1b|1c|1d|1e|1f].X). I am not sure if any code is using this information. But in theory, these host-bridge devices are not on the same node as where the PCI root complex lives (e.g. 0 and 4 from the example above). If we want the "numa_node" to really representing the actual node, then the quirk has to stay for now. We might need to come up with a different logic to replace the quirks here, which would automatically determine the actual node value for these host-bridge devices. Suravee Suravee -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 28, 2014 at 8:02 PM, Suravee Suthikulanit <suravee.suthikulpanit@amd.com> wrote: > Sorry for late reply. My concern is that removing the "quirk_amd_nb_node()" > will affect the value of "numa_node" of the host bridge devices (i.e. > X:00.[18|19|1a|1b|1c|1d|1e|1f].X). I am not sure if any code is using this > information. But in theory, these host-bridge devices are not on the same > node as where the PCI root complex lives (e.g. 0 and 4 from the example > above). I doubt anything in the kernel uses the node number for these devices (00:[18|19|...]). The only place the PCI core uses it is to run a driver probe method on the same node as the device. Are there even drivers for these devices? They aren't PCI-to-PCI bridges, so there are no devices below them that would be affected by their node numbers. > If we want the "numa_node" to really representing the actual node, then the > quirk has to stay for now. We might need to come up with a different logic > to replace the quirks here, which would automatically determine the actual > node value for these host-bridge devices. It sounds like the numa_node for these devices in sysfs is misleading unless we have a quirk like this. If that's important, I think it could be fixed by having the BIOS provide _PXM methods for them. But I don't think it is, and I'm inclined to remove the quirk. I'm pushing hard to get rid of CPU-specific code like this because there are generic methods to do it, e.g., _PXM, and the CPU-specific code is a perennial maintenance headache. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index ff898bb..abbd6bc 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -514,64 +514,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, #endif -#if defined(CONFIG_PCI) && defined(CONFIG_NUMA) -/* Set correct numa_node information for AMD NB functions */ -static void quirk_amd_nb_node(struct pci_dev *dev) -{ - struct pci_dev *nb_ht; - unsigned int devfn; - u32 node; - u32 val; - - devfn = PCI_DEVFN(PCI_SLOT(dev->devfn), 0); - nb_ht = pci_get_slot(dev->bus, devfn); - if (!nb_ht) - return; - - pci_read_config_dword(nb_ht, 0x60, &val); - node = pcibus_to_node(dev->bus) | (val & 7); - /* - * Some hardware may return an invalid node ID, - * so check it first: - */ - if (node_online(node)) - set_dev_node(&dev->dev, node); - pci_dev_put(nb_ht); -} - -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MEMCTL, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_HT, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MAP, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_DRAM, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_LINK, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F0, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F1, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F2, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4, - quirk_amd_nb_node); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F5, - quirk_amd_nb_node); - -#endif - #ifdef CONFIG_PCI /* * Processor does not ensure DRAM scrub read/write sequence
With the amd_bus.c updates to support additional AMD processors (11h, 12h, 14h 15h and 16h) 'quirk_amd_nb_node' seems to be redundant. This patch removes it. Signed-off-by: Myron Stowe <myron.stowe@redhat.com> --- arch/x86/kernel/quirks.c | 58 ---------------------------------------------- 1 files changed, 0 insertions(+), 58 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html