| Message ID | 4c4cb2b4391.4d23d508@auth.smtp.1and1.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 250a93501d6265bbb9ddf06af25ac9ae64782297 |
| Headers | show |
| Series | powerpc/pasemi: Seach for PCI root bus by compatible property | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | next/apply_patch Patch failed to apply |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Darren Stevens <darren@stevens-zone.net> writes: > Pasemi arch code finds the root of the PCI-e bus by searching the > device-tree for a node called 'pxp'. But the root bus has a > compatible property of 'pasemi,rootbus' so search for that instead. > > Signed-off-by: Darren Stevens <darren@stevens-zone.net> > --- > > This works on the Amigaone X1000, I don't know if this method of > finding the pci bus was there bcause of earlier firmwares. Does anyone have another pasemi board they can test this on? The last time I plugged mine in it popped the power supply and took out power to half the office :) - I haven't had a chance to try it since. cheers > diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c > index c7c8607..be62380 100644 > --- a/arch/powerpc/platforms/pasemi/pci.c > +++ b/arch/powerpc/platforms/pasemi/pci.c > @@ -216,6 +216,7 @@ static int __init pas_add_bridge(struct device_node *dev) > void __init pas_pci_init(void) > { > struct device_node *np, *root; > + int res; > > root = of_find_node_by_path("/"); > if (!root) { > @@ -226,11 +227,11 @@ void __init pas_pci_init(void) > > pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS); > > - for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) > - if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np)) > - of_node_get(np); > - > - of_node_put(root); > + np = of_find_compatible_node(root, NULL, "pasemi,rootbus"); > + if (np) { > + res = pas_add_bridge(np); > + of_node_put(np); > + } > } > > void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
Michael Ellerman <mpe@ellerman.id.au> writes: > Darren Stevens <darren@stevens-zone.net> writes: > >> Pasemi arch code finds the root of the PCI-e bus by searching the >> device-tree for a node called 'pxp'. But the root bus has a >> compatible property of 'pasemi,rootbus' so search for that instead. >> >> Signed-off-by: Darren Stevens <darren@stevens-zone.net> >> --- >> >> This works on the Amigaone X1000, I don't know if this method of >> finding the pci bus was there bcause of earlier firmwares. > > Does anyone have another pasemi board they can test this on? > > The last time I plugged mine in it popped the power supply and took out > power to half the office :) - I haven't had a chance to try it since. I actually I remembered I have a device tree lying around from an electra. It has: [I] home:pxp@0,80000000(7)(I)> lsprop name compatible name "pxp" compatible "pasemi,rootbus" "pa-pxp" So it looks like the patch would work fine on it at least. cheers >> diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c >> index c7c8607..be62380 100644 >> --- a/arch/powerpc/platforms/pasemi/pci.c >> +++ b/arch/powerpc/platforms/pasemi/pci.c >> @@ -216,6 +216,7 @@ static int __init pas_add_bridge(struct device_node *dev) >> void __init pas_pci_init(void) >> { >> struct device_node *np, *root; >> + int res; >> >> root = of_find_node_by_path("/"); >> if (!root) { >> @@ -226,11 +227,11 @@ void __init pas_pci_init(void) >> >> pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS); >> >> - for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) >> - if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np)) >> - of_node_get(np); >> - >> - of_node_put(root); >> + np = of_find_compatible_node(root, NULL, "pasemi,rootbus"); >> + if (np) { >> + res = pas_add_bridge(np); >> + of_node_put(np); >> + } >> } >> >> void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
Just for info: I tested it on my Nemo board today and it works. -- Christian On 31 July 2018 at 2:04PM, Michael Ellerman wrote: > Michael Ellerman <mpe@ellerman.id.au> writes: >> Darren Stevens <darren@stevens-zone.net> writes: >> >>> Pasemi arch code finds the root of the PCI-e bus by searching the >>> device-tree for a node called 'pxp'. But the root bus has a >>> compatible property of 'pasemi,rootbus' so search for that instead. >>> >>> Signed-off-by: Darren Stevens <darren@stevens-zone.net> >>> --- >>> >>> This works on the Amigaone X1000, I don't know if this method of >>> finding the pci bus was there bcause of earlier firmwares. >> Does anyone have another pasemi board they can test this on? >> >> The last time I plugged mine in it popped the power supply and took out >> power to half the office :) - I haven't had a chance to try it since. > I actually I remembered I have a device tree lying around from an electra. > > It has: > > [I] home:pxp@0,80000000(7)(I)> lsprop name compatible > name "pxp" > compatible "pasemi,rootbus" > "pa-pxp" > > > So it looks like the patch would work fine on it at least. > > cheers > >>> diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c >>> index c7c8607..be62380 100644 >>> --- a/arch/powerpc/platforms/pasemi/pci.c >>> +++ b/arch/powerpc/platforms/pasemi/pci.c >>> @@ -216,6 +216,7 @@ static int __init pas_add_bridge(struct device_node *dev) >>> void __init pas_pci_init(void) >>> { >>> struct device_node *np, *root; >>> + int res; >>> >>> root = of_find_node_by_path("/"); >>> if (!root) { >>> @@ -226,11 +227,11 @@ void __init pas_pci_init(void) >>> >>> pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS); >>> >>> - for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) >>> - if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np)) >>> - of_node_get(np); >>> - >>> - of_node_put(root); >>> + np = of_find_compatible_node(root, NULL, "pasemi,rootbus"); >>> + if (np) { >>> + res = pas_add_bridge(np); >>> + of_node_put(np); >>> + } >>> } >>> >>> void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
Christian Zigotzky <chzigotzky@xenosoft.de> writes: > Just for info: I tested it on my Nemo board today and it works. Awesome thanks. That's probably sufficient to merge it, and if it breaks anything we can always revert it. cheers > On 31 July 2018 at 2:04PM, Michael Ellerman wrote: >> Michael Ellerman <mpe@ellerman.id.au> writes: >>> Darren Stevens <darren@stevens-zone.net> writes: >>> >>>> Pasemi arch code finds the root of the PCI-e bus by searching the >>>> device-tree for a node called 'pxp'. But the root bus has a >>>> compatible property of 'pasemi,rootbus' so search for that instead. >>>> >>>> Signed-off-by: Darren Stevens <darren@stevens-zone.net> >>>> --- >>>> >>>> This works on the Amigaone X1000, I don't know if this method of >>>> finding the pci bus was there bcause of earlier firmwares. >>> Does anyone have another pasemi board they can test this on? >>> >>> The last time I plugged mine in it popped the power supply and took out >>> power to half the office :) - I haven't had a chance to try it since. >> I actually I remembered I have a device tree lying around from an electra. >> >> It has: >> >> [I] home:pxp@0,80000000(7)(I)> lsprop name compatible >> name "pxp" >> compatible "pasemi,rootbus" >> "pa-pxp" >> >> >> So it looks like the patch would work fine on it at least. >> >> cheers >> >>>> diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c >>>> index c7c8607..be62380 100644 >>>> --- a/arch/powerpc/platforms/pasemi/pci.c >>>> +++ b/arch/powerpc/platforms/pasemi/pci.c >>>> @@ -216,6 +216,7 @@ static int __init pas_add_bridge(struct device_node *dev) >>>> void __init pas_pci_init(void) >>>> { >>>> struct device_node *np, *root; >>>> + int res; >>>> >>>> root = of_find_node_by_path("/"); >>>> if (!root) { >>>> @@ -226,11 +227,11 @@ void __init pas_pci_init(void) >>>> >>>> pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS); >>>> >>>> - for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) >>>> - if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np)) >>>> - of_node_get(np); >>>> - >>>> - of_node_put(root); >>>> + np = of_find_compatible_node(root, NULL, "pasemi,rootbus"); >>>> + if (np) { >>>> + res = pas_add_bridge(np); >>>> + of_node_put(np); >>>> + } >>>> } >>>> >>>> void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
On Wed, Aug 1, 2018 at 7:36 AM, Michael Ellerman <mpe@ellerman.id.au> wrote: > Christian Zigotzky <chzigotzky@xenosoft.de> writes: > >> Just for info: I tested it on my Nemo board today and it works. > > Awesome thanks. > > That's probably sufficient to merge it, and if it breaks anything we can > always revert it. Should be fine, all known boards have the properties in question, and I doubt anyone has anything but Nemo and Electra/Chitra boards out there. It's a virtual root bus, so all boards have it irrespective of what PCIe is brought out. (I should hook up my test system and get it into the CI cycle again, maybe this fall). Acked-by: Olof Johansson <olof@lixom.net> -Olof
Olof Johansson <olof@lixom.net> writes: > On Wed, Aug 1, 2018 at 7:36 AM, Michael Ellerman <mpe@ellerman.id.au> wrote: >> Christian Zigotzky <chzigotzky@xenosoft.de> writes: >> >>> Just for info: I tested it on my Nemo board today and it works. >> >> Awesome thanks. >> >> That's probably sufficient to merge it, and if it breaks anything we can >> always revert it. > > Should be fine, all known boards have the properties in question, and > I doubt anyone has anything but Nemo and Electra/Chitra boards out > there. > > It's a virtual root bus, so all boards have it irrespective of what > PCIe is brought out. > > (I should hook up my test system and get it into the CI cycle again, > maybe this fall). > > > Acked-by: Olof Johansson <olof@lixom.net> Thanks. cheers
On Wed, 2018-07-25 at 20:55:18 UTC, Darren Stevens wrote: > Pasemi arch code finds the root of the PCI-e bus by searching the > device-tree for a node called 'pxp'. But the root bus has a > compatible property of 'pasemi,rootbus' so search for that instead. > > Signed-off-by: Darren Stevens <darren@stevens-zone.net> > Acked-by: Olof Johansson <olof@lixom.net> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/250a93501d6265bbb9ddf06af25ac9 cheers
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c index c7c8607..be62380 100644 --- a/arch/powerpc/platforms/pasemi/pci.c +++ b/arch/powerpc/platforms/pasemi/pci.c @@ -216,6 +216,7 @@ static int __init pas_add_bridge(struct device_node *dev) void __init pas_pci_init(void) { struct device_node *np, *root; + int res; root = of_find_node_by_path("/"); if (!root) { @@ -226,11 +227,11 @@ void __init pas_pci_init(void) pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS); - for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) - if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np)) - of_node_get(np); - - of_node_put(root); + np = of_find_compatible_node(root, NULL, "pasemi,rootbus"); + if (np) { + res = pas_add_bridge(np); + of_node_put(np); + } } void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
Pasemi arch code finds the root of the PCI-e bus by searching the device-tree for a node called 'pxp'. But the root bus has a compatible property of 'pasemi,rootbus' so search for that instead. Signed-off-by: Darren Stevens <darren@stevens-zone.net> --- This works on the Amigaone X1000, I don't know if this method of finding the pci bus was there bcause of earlier firmwares.