| Message ID | 1486523463-19953-1-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 08/02/17 14:11, Gavin Shan wrote: > The CAPI driver creates virtual PHB (vPHB) from the CAPI adapter. > The vPHB's IO and memory windows aren't built from device-tree node > as we do for normal PHBs. A error message is thrown in below path > when trying to probe AFUs contained in the adapter. The error message > is confusing and unnecessary. > > cxl_probe() > pci_init_afu() > cxl_pci_vphb_add() > pcibios_scan_phb() > pcibios_setup_phb_resources() > > This removes the error message. We might have the case where the > first memory window on real PHB isn't populated properly because > of error in "ranges" property in the device-tree node. We can check > the device-tree instead for that. This also removes one unnecessary > blank line in the function. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > v2: Removes the error message instead of avoiding it > --- > arch/powerpc/kernel/pci-common.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index 74bec54..05bfdae 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -1559,16 +1559,10 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, > /* Hookup PHB Memory resources */ > for (i = 0; i < 3; ++i) { > res = &hose->mem_resources[i]; > - if (!res->flags) { > - if (i == 0) > - printk(KERN_ERR "PCI: Memory resource 0 not set for " > - "host bridge %s (domain %d)\n", > - hose->dn->full_name, hose->global_number); > + if (!res->flags) > continue; > - } > - offset = hose->mem_offset[i]; > - > > + offset = hose->mem_offset[i]; > pr_debug("PCI: PHB MEM resource %d = %pR off 0x%08llx\n", i, > res, (unsigned long long)offset); > >
On Wed, 2017-02-08 at 03:11:03 UTC, Gavin Shan wrote: > The CAPI driver creates virtual PHB (vPHB) from the CAPI adapter. > The vPHB's IO and memory windows aren't built from device-tree node > as we do for normal PHBs. A error message is thrown in below path > when trying to probe AFUs contained in the adapter. The error message > is confusing and unnecessary. > > cxl_probe() > pci_init_afu() > cxl_pci_vphb_add() > pcibios_scan_phb() > pcibios_setup_phb_resources() > > This removes the error message. We might have the case where the > first memory window on real PHB isn't populated properly because > of error in "ranges" property in the device-tree node. We can check > the device-tree instead for that. This also removes one unnecessary > blank line in the function. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/727597d12140b342a3deef10348b5e cheers
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 74bec54..05bfdae 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1559,16 +1559,10 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, /* Hookup PHB Memory resources */ for (i = 0; i < 3; ++i) { res = &hose->mem_resources[i]; - if (!res->flags) { - if (i == 0) - printk(KERN_ERR "PCI: Memory resource 0 not set for " - "host bridge %s (domain %d)\n", - hose->dn->full_name, hose->global_number); + if (!res->flags) continue; - } - offset = hose->mem_offset[i]; - + offset = hose->mem_offset[i]; pr_debug("PCI: PHB MEM resource %d = %pR off 0x%08llx\n", i, res, (unsigned long long)offset);
The CAPI driver creates virtual PHB (vPHB) from the CAPI adapter. The vPHB's IO and memory windows aren't built from device-tree node as we do for normal PHBs. A error message is thrown in below path when trying to probe AFUs contained in the adapter. The error message is confusing and unnecessary. cxl_probe() pci_init_afu() cxl_pci_vphb_add() pcibios_scan_phb() pcibios_setup_phb_resources() This removes the error message. We might have the case where the first memory window on real PHB isn't populated properly because of error in "ranges" property in the device-tree node. We can check the device-tree instead for that. This also removes one unnecessary blank line in the function. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- v2: Removes the error message instead of avoiding it --- arch/powerpc/kernel/pci-common.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)