| Message ID | 1415760111-12344-1-git-send-email-gwshan@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Nov 12, 2014 at 01:41:51PM +1100, Gavin Shan wrote: > We have same warning message for FLR and AF FLR and users can't > know which type of resets the PCI device is taking when there are > pending transactions. The patch makes them different for FLR and > AF FLR cases. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Applied to pci/misc for v3.19, thanks! > --- > v2: Adjusted messages according to Bjorn's suggestion > --- > drivers/pci/pci.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index 625a4ac..3f12383 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -3144,7 +3144,8 @@ static int pcie_flr(struct pci_dev *dev, int probe) > return 0; > > if (!pci_wait_for_pending_transaction(dev)) > - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); > + dev_err(&dev->dev, "timed out waiting for pending transaction; " > + "performing function level reset\n"); > > pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); > > @@ -3178,7 +3179,8 @@ static int pci_af_flr(struct pci_dev *dev, int probe) > PCI_AF_STATUS_TP << 8)) > goto clear; > > - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); > + dev_err(&dev->dev, "timed out waiting for pending transaction; " > + "performing AF function level reset\n"); > > clear: > pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR); > -- > 1.8.3.2 > -- 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/drivers/pci/pci.c b/drivers/pci/pci.c index 625a4ac..3f12383 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3144,7 +3144,8 @@ static int pcie_flr(struct pci_dev *dev, int probe) return 0; if (!pci_wait_for_pending_transaction(dev)) - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); + dev_err(&dev->dev, "timed out waiting for pending transaction; " + "performing function level reset\n"); pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); @@ -3178,7 +3179,8 @@ static int pci_af_flr(struct pci_dev *dev, int probe) PCI_AF_STATUS_TP << 8)) goto clear; - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); + dev_err(&dev->dev, "timed out waiting for pending transaction; " + "performing AF function level reset\n"); clear: pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
We have same warning message for FLR and AF FLR and users can't know which type of resets the PCI device is taking when there are pending transactions. The patch makes them different for FLR and AF FLR cases. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- v2: Adjusted messages according to Bjorn's suggestion --- drivers/pci/pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)