On Tue, 24 Apr 2018 10:54:26 -0400 James Puthukattukaran <james.puthukattukaran@xxxxxxxxxx> wrote: > The IDT switch incorrectly flags an ACS source violation on a read config > request to an end point device on the completion (IDT 89H32H8G3-YC, > errata #36) even though the PCI Express spec states that completions are > never affected by ACS source violation (PCI Spec 3.1, Section 6.12.1.1). Here's > the specific copy of the errata text > > "Item #36 - Downstream port applies ACS Source Validation to Completions > Section 6.12.1.1 of the PCI Express Base Specification 3.1 states > that completions are never affected > by ACS Source Validation. However, completions received by a > downstream port of the PCIe switch from a device that has not yet > captured a PCIe bus number are incorrectly dropped by ACS source > validation by the switch downstream port. > > Workaround: Issue a CfgWr1 to the downstream device before issuing > the first CfgRd1 to the device. > This allows the downstream device to capture its bus number; ACS > source validation no longer stops > completions from being forwarded by the downstream port. It has been > observed that Microsoft Windows implements this workaround already; > however, some versions of Linux and other operating systems may not. " > > The suggested workaround by IDT is to issue a configuration write to the > downstream device before issuing the first config read. This allows the > downstream device to capture its bus number, thus avoiding the ACS > violation on the completion. In order to make sure that the device is ready > for config accesses, we do what is currently done in making config reads > till it succeeds and then do the config write as specified by the errata. > However, to avoid hitting the errata issue when doing config reads, we > disable ACS SV around this process. > > The patch does the following - > > 1. Disable ACS source violation if enabled. > 2. Wait for config space access to become available by reading vendor id > 3. Do a config write to the end point (errata workaround) > 4. Enable ACS source validation (if it was enabled to begin with) > > Signed-off-by: James Puthukattukaran <james.puthukattukaran@xxxxxxxxxx> > --- > drivers/pci/pci.h | 2 ++ > drivers/pci/quirks.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 99 insertions(+) > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index 39ea6ee..d0d588d 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -227,6 +227,8 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, > int crs_timeout); > int pci_bus_specific_read_dev_vendor_id(struct pci_bus *bus, int devfn, > u32 *pl, int crs_timeout); > +bool pci_bus_generic_read_dev_vendor_id(struct pci_bus *bus, int devfn, > + u32 *pl, int crs_timeout); > int pci_setup_device(struct pci_dev *dev); > int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, > struct resource *res, unsigned int reg); > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index c32c5ec..89cd47d 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -4742,12 +4742,109 @@ static void quirk_gpu_hda(struct pci_dev *hda) > DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, > PCI_CLASS_MULTIMEDIA_HD_AUDIO, 8, quirk_gpu_hda); > > +/* > + * The IDT switch incorrectly flags an ACS source violation on a read config > + * request to an end point device on the completion (IDT 89H32H8G3-YC, > + * errata #36) even though the PCI Express spec states that completions are > + * never affected by ACS source violation (PCI Spec 3.1, Section 6.12.1.1). > + * Here's * the specific copy of the errata text -- > + * > + * "Item #36 - Downstream port applies ACS Source Validation to Completions > + * Section 6.12.1.1 of the PCI Express Base Specification 3.1 states > + * that completions are never affected > + * by ACS Source Validation. However, completions received by a > + * downstream port of the PCIe switch from a device that has not yet > + * captured a PCIe bus number are incorrectly dropped by ACS source > + * validation by the switch downstream port." > + * > + * The suggested workaround by IDT is to issue a configuration write to the > + * downstream device before issuing the first config read. This allows the > + * downstream device to capture its bus number, thus avoiding the ACS > + * violation on the completion. In order to make sure that the device is ready > + * for config accesses, we do what is currently done in making config reads > + * till it succeeds and then do the config write as specified by the errata. > + * However, to avoid hitting the errata issue when doing config reads, we > + * disable ACS SV around this process. > + */ > +static int pci_idt_acs_quirk(struct pci_bus *bus, int devfn, int enable, > + bool found) > +{ > + int pos; > + u16 cap; > + u16 ctrl; > + int retval; > + struct pci_dev *dev = bus->self; > + > + > + /* Write 0 to the devfn device under the PCIE switch (bus->self) > + * as part of forcing the devfn number to latch with the device > + * below > + */ > + if (found) > + pci_bus_write_config_word(bus, devfn, PCI_VENDOR_ID, 0); > + > + > + /* Enable/disable ACS SV feature (based on enable flag) */ > + pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS); > + if (!pos) > + return -ENODEV; > + > + pci_read_config_word(dev, pos + PCI_ACS_CAP, &cap); > + > + if (!(cap & PCI_ACS_SV)) > + return -ENODEV; > + > + pci_read_config_word(dev, pos + PCI_ACS_CTRL, &ctrl); > + > + retval = !!(ctrl & cap & PCI_ACS_SV); > + if (enable) > + ctrl |= (cap & PCI_ACS_SV); > + else > + ctrl &= ~(cap & PCI_ACS_SV); > + > + pci_write_config_word(dev, pos + PCI_ACS_CTRL, ctrl); > + > + /* return the previous state of the ACS SV state i.e was SV enabled > + * or disabled? > + */ > + return retval; > +} > + > +static int pci_idt_bus_quirk(struct pci_bus *bus, int devfn, u32 *l, > + int timeout) > +{ > + int enable; > + bool found; > + > + /* > + * Disable acs for the IDT switch before attempting the initial > + * config accesses to the endpoint device. > + */ > + enable = pci_idt_acs_quirk(bus, devfn, 0, false); > + > + /* > + * found indicates whether the endpoint device was identified > + * as present or not > + */ > + > + found = pci_bus_generic_read_dev_vendor_id(bus, devfn, l, timeout); > + > + /* > + * re-enable acs feature for the switch again if it was enabled to > + * start with > + */ Inconsistent comment style even within the same patch. Otherwise, Reviewed-by: Alex Williamson <alex.williamson@xxxxxxxxxx> > + if (enable > 0) > + pci_idt_acs_quirk(bus, devfn, enable, found); > + > + return found ? 1 : 0; > +} > > static const struct pci_bus_specific_quirk{ > u16 vendor; > u16 device; > int (*bus_quirk)(struct pci_bus *bus, int devfn, u32 *l, int timeout); > } pci_bus_specific_quirks[] = { > + { PCI_VENDOR_ID_IDT, 0x80b5, pci_idt_bus_quirk}, > {0} > }; >