| Message ID | 7ae025867a92715bb6fe253834211e2745f53787.1553050609.git.sbobroff@linux.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (de3c83c2fd2b87cf68214eda76dfa66989d78cb6) |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 0 warnings, 5 checks, 93 lines checked |
On 20/03/2019 13:58, Sam Bobroff wrote: > Also remove useless comment. Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> > --- > arch/powerpc/kernel/eeh.c | 2 +- > arch/powerpc/platforms/powernv/eeh-powernv.c | 14 ++++++++---- > arch/powerpc/platforms/pseries/eeh_pseries.c | 23 +++++++++++++++----- > 3 files changed, 28 insertions(+), 11 deletions(-) > > diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c > index 8d3c36a1f194..b14d89547895 100644 > --- a/arch/powerpc/kernel/eeh.c > +++ b/arch/powerpc/kernel/eeh.c > @@ -1291,7 +1291,7 @@ void eeh_add_device_late(struct pci_dev *dev) > pdn = pci_get_pdn_by_devfn(dev->bus, dev->devfn); > edev = pdn_to_eeh_dev(pdn); > if (edev->pdev == dev) { > - pr_debug("EEH: Already referenced !\n"); > + pr_debug("EEH: Device %s already referenced!\n", pci_name(dev)); > return; > } > > diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c > index f0a95f663810..51c5b6bb9b0e 100644 > --- a/arch/powerpc/platforms/powernv/eeh-powernv.c > +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c > @@ -50,10 +50,7 @@ void pnv_pcibios_bus_add_device(struct pci_dev *pdev) > if (!pdev->is_virtfn) > return; > > - /* > - * The following operations will fail if VF's sysfs files > - * aren't created or its resources aren't finalized. > - */ > + pr_debug("%s: EEH: Setting up device %s.\n", __func__, pci_name(pdev)); > eeh_add_device_early(pdn); > eeh_add_device_late(pdev); > eeh_sysfs_add_device(pdev); > @@ -389,6 +386,10 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) > int ret; > int config_addr = (pdn->busno << 8) | (pdn->devfn); > > + pr_debug("%s: probing %04x:%02x:%02x.%01x\n", > + __func__, hose->global_number, pdn->busno, > + PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); > + > /* > * When probing the root bridge, which doesn't have any > * subordinate PCI devices. We don't have OF node for > @@ -483,6 +484,11 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) > /* Save memory bars */ > eeh_save_bars(edev); > > + pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%x-PE#%x\n", > + __func__, pdn->busno, PCI_SLOT(pdn->devfn), > + PCI_FUNC(pdn->devfn), edev->pe->phb->global_number, > + edev->pe->addr); > + > return NULL; > } > > diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c > index 7aa50258dd42..ae06878fbdea 100644 > --- a/arch/powerpc/platforms/pseries/eeh_pseries.c > +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c > @@ -65,6 +65,8 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) > if (!pdev->is_virtfn) > return; > > + pr_debug("%s: EEH: Setting up device %s.\n", __func__, pci_name(pdev)); > + > pdn->device_id = pdev->device; > pdn->vendor_id = pdev->vendor; > pdn->class_code = pdev->class; > @@ -251,6 +253,10 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) > int enable = 0; > int ret; > > + pr_debug("%s: probing %04x:%02x:%02x.%01x\n", > + __func__, pdn->phb->global_number, pdn->busno, > + PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); > + > /* Retrieve OF node and eeh device */ > edev = pdn_to_eeh_dev(pdn); > if (!edev || edev->pe) > @@ -294,7 +300,12 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) > > /* Enable EEH on the device */ > ret = eeh_ops->set_option(&pe, EEH_OPT_ENABLE); > - if (!ret) { > + if (ret) { > + pr_debug("%s: EEH failed to enable on %02x:%02x.%01x PHB#%x-PE#%x (code %d)\n", > + __func__, pdn->busno, PCI_SLOT(pdn->devfn), > + PCI_FUNC(pdn->devfn), pe.phb->global_number, > + pe.addr, ret); > + } else { > /* Retrieve PE address */ > edev->pe_config_addr = eeh_ops->get_pe_addr(&pe); > pe.addr = edev->pe_config_addr; > @@ -310,11 +321,6 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) > if (enable) { > eeh_add_flag(EEH_ENABLED); > eeh_add_to_parent_pe(edev); > - > - pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%x-PE#%x\n", > - __func__, pdn->busno, PCI_SLOT(pdn->devfn), > - PCI_FUNC(pdn->devfn), pe.phb->global_number, > - pe.addr); > } else if (pdn->parent && pdn_to_eeh_dev(pdn->parent) && > (pdn_to_eeh_dev(pdn->parent))->pe) { > /* This device doesn't support EEH, but it may have an > @@ -323,6 +329,11 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) > edev->pe_config_addr = pdn_to_eeh_dev(pdn->parent)->pe_config_addr; > eeh_add_to_parent_pe(edev); > } > + pr_debug("%s: EEH %s on %02x:%02x.%01x PHB#%x-PE#%x (code %d)\n", > + __func__, (enable ? "enabled" : "unsupported"), > + pdn->busno, PCI_SLOT(pdn->devfn), > + PCI_FUNC(pdn->devfn), pe.phb->global_number, > + pe.addr, ret); > } > > /* Save memory bars */ >
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 8d3c36a1f194..b14d89547895 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1291,7 +1291,7 @@ void eeh_add_device_late(struct pci_dev *dev) pdn = pci_get_pdn_by_devfn(dev->bus, dev->devfn); edev = pdn_to_eeh_dev(pdn); if (edev->pdev == dev) { - pr_debug("EEH: Already referenced !\n"); + pr_debug("EEH: Device %s already referenced!\n", pci_name(dev)); return; } diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c index f0a95f663810..51c5b6bb9b0e 100644 --- a/arch/powerpc/platforms/powernv/eeh-powernv.c +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c @@ -50,10 +50,7 @@ void pnv_pcibios_bus_add_device(struct pci_dev *pdev) if (!pdev->is_virtfn) return; - /* - * The following operations will fail if VF's sysfs files - * aren't created or its resources aren't finalized. - */ + pr_debug("%s: EEH: Setting up device %s.\n", __func__, pci_name(pdev)); eeh_add_device_early(pdn); eeh_add_device_late(pdev); eeh_sysfs_add_device(pdev); @@ -389,6 +386,10 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) int ret; int config_addr = (pdn->busno << 8) | (pdn->devfn); + pr_debug("%s: probing %04x:%02x:%02x.%01x\n", + __func__, hose->global_number, pdn->busno, + PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); + /* * When probing the root bridge, which doesn't have any * subordinate PCI devices. We don't have OF node for @@ -483,6 +484,11 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) /* Save memory bars */ eeh_save_bars(edev); + pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%x-PE#%x\n", + __func__, pdn->busno, PCI_SLOT(pdn->devfn), + PCI_FUNC(pdn->devfn), edev->pe->phb->global_number, + edev->pe->addr); + return NULL; } diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c index 7aa50258dd42..ae06878fbdea 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -65,6 +65,8 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) if (!pdev->is_virtfn) return; + pr_debug("%s: EEH: Setting up device %s.\n", __func__, pci_name(pdev)); + pdn->device_id = pdev->device; pdn->vendor_id = pdev->vendor; pdn->class_code = pdev->class; @@ -251,6 +253,10 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) int enable = 0; int ret; + pr_debug("%s: probing %04x:%02x:%02x.%01x\n", + __func__, pdn->phb->global_number, pdn->busno, + PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); + /* Retrieve OF node and eeh device */ edev = pdn_to_eeh_dev(pdn); if (!edev || edev->pe) @@ -294,7 +300,12 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) /* Enable EEH on the device */ ret = eeh_ops->set_option(&pe, EEH_OPT_ENABLE); - if (!ret) { + if (ret) { + pr_debug("%s: EEH failed to enable on %02x:%02x.%01x PHB#%x-PE#%x (code %d)\n", + __func__, pdn->busno, PCI_SLOT(pdn->devfn), + PCI_FUNC(pdn->devfn), pe.phb->global_number, + pe.addr, ret); + } else { /* Retrieve PE address */ edev->pe_config_addr = eeh_ops->get_pe_addr(&pe); pe.addr = edev->pe_config_addr; @@ -310,11 +321,6 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) if (enable) { eeh_add_flag(EEH_ENABLED); eeh_add_to_parent_pe(edev); - - pr_debug("%s: EEH enabled on %02x:%02x.%01x PHB#%x-PE#%x\n", - __func__, pdn->busno, PCI_SLOT(pdn->devfn), - PCI_FUNC(pdn->devfn), pe.phb->global_number, - pe.addr); } else if (pdn->parent && pdn_to_eeh_dev(pdn->parent) && (pdn_to_eeh_dev(pdn->parent))->pe) { /* This device doesn't support EEH, but it may have an @@ -323,6 +329,11 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) edev->pe_config_addr = pdn_to_eeh_dev(pdn->parent)->pe_config_addr; eeh_add_to_parent_pe(edev); } + pr_debug("%s: EEH %s on %02x:%02x.%01x PHB#%x-PE#%x (code %d)\n", + __func__, (enable ? "enabled" : "unsupported"), + pdn->busno, PCI_SLOT(pdn->devfn), + PCI_FUNC(pdn->devfn), pe.phb->global_number, + pe.addr, ret); } /* Save memory bars */
Also remove useless comment. Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/platforms/powernv/eeh-powernv.c | 14 ++++++++---- arch/powerpc/platforms/pseries/eeh_pseries.c | 23 +++++++++++++++----- 3 files changed, 28 insertions(+), 11 deletions(-)