Patchwork [2/2,RESEND] x86/pci/amd: Enable early_fill_mp_bus_to_node on AMD family 15h models 0-0xf

login
register
mail settings
Submitter Andreas Herrmann
Date April 27, 2012, 2:37 p.m.
Message ID <20120427143745.GD27535@alberich.amd.com>
Download mbox | patch
Permalink /patch/155488/
State Superseded
Headers show

Comments

Andreas Herrmann - April 27, 2012, 2:37 p.m.
While at it avoid calling this function on family 11h (aka Griffin)
which was a mobile part and doesn't support NUMA.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
 arch/x86/pci/amd_bus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Bjorn Helgaas - May 2, 2012, 5:34 p.m.
On Fri, Apr 27, 2012 at 8:37 AM, Andreas Herrmann
<andreas.herrmann3@amd.com> wrote:
>
> While at it avoid calling this function on family 11h (aka Griffin)
> which was a mobile part and doesn't support NUMA.

This changelog doesn't seem like it goes with this patch.  It looks
more related to the first patch (though that affects family 11h and
greater, not just family 11h).

> Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
> ---
>  arch/x86/pci/amd_bus.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
> index 0384e69..d552b29 100644
> --- a/arch/x86/pci/amd_bus.c
> +++ b/arch/x86/pci/amd_bus.c
> @@ -27,7 +27,7 @@ static struct pci_hostbridge_probe pci_probes[] __initdata = {
>        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1100 },
>        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
>        { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
> -       { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 },
> +       { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1600 },
>  };
>
>  /**
> --
> 1.7.8.5
>
>
>
--
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
Andreas Herrmann - May 4, 2012, 1:25 p.m.
On Wed, May 02, 2012 at 11:34:15AM -0600, Bjorn Helgaas wrote:
> On Fri, Apr 27, 2012 at 8:37 AM, Andreas Herrmann
> <andreas.herrmann3@amd.com> wrote:
> >
> > While at it avoid calling this function on family 11h (aka Griffin)
> > which was a mobile part and doesn't support NUMA.
> 
> This changelog doesn't seem like it goes with this patch.  It looks
> more related to the first patch (though that affects family 11h and
> greater, not just family 11h).

So maybe I should repeat the contents of the subject line in the
changelog.

The first patch restores the function to set the NUMA node info for
busses. Linux behaviour shouldn't change after the first patch at all.

This (the second) patch will enable node detection for AMD CPU family
15h model 00-0fh (with 0x1600 as device id for NB function 0). (see
subject line) In addition it removes the NB id for CPU family 11h from
this code.  That CPU was used only in Laptops (single socket). A
mapping of bus to node is not required there. And also figuring out
MMIO and I/O port apertures while ignoring _CRS shouldn't be a use
case for such systems.

I think Device ID 0x1300 was added with commit
35ddd068fb94b187e94a3fc497ccecf27bdda9ae (x86: use bus conf in NB conf
fun1 to get bus range on, on 64-bit)

But unfortunately the changelog of this patch doesn't mention why this
is strictly req'd.


HTH,

Andreas

> >  arch/x86/pci/amd_bus.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
> > index 0384e69..d552b29 100644
> > --- a/arch/x86/pci/amd_bus.c
> > +++ b/arch/x86/pci/amd_bus.c
> > @@ -27,7 +27,7 @@ static struct pci_hostbridge_probe pci_probes[] __initdata = {
> >        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1100 },
> >        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
> >        { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
> > -       { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 },
> > +       { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1600 },
> >  };
> >
> >  /**
> > --
> > 1.7.8.5
> >
> >
> >
> 


--
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

Patch

diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 0384e69..d552b29 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -27,7 +27,7 @@  static struct pci_hostbridge_probe pci_probes[] __initdata = {
 	{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1100 },
 	{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
 	{ 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
-	{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 },
+	{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1600 },
 };
 
 /**