On Mon, May 02, 2016 at 03:25:38PM -0500, Bjorn Helgaas wrote: > On Thu, Apr 28, 2016 at 04:24:48PM -0600, Keith Busch wrote: > > This adds driver support for root and downstream ports that implement > > the PCI-Express Downstream Port Containment extended capability. DPC is > > an optional capability to contain uncorrectable errors below a port. > > > > For more information on DPC, please see PCI Express Base Specification > > Revision 4, section 7.31, or view the PCI-SIG DPC ECN here: > > > > https://pcisig.com/sites/default/files/specification_documents/ECN_DPC_2012-02-09_finalized.pdf > > > > When a DPC event is triggered, the h/w disables downstream links, so > > the DPC driver schedules removal for all devices below this port. This > > may happen concurrently with a PCI-e hotplug driver if enabled. When all > > downstream devices are removed and the link state transitions to disabled, > > the DPC driver clears the DPC status and interrupt bits so the link may > > retrain for a newly connected device. > > > > The pcie device naming is updated to accomodate the additional service > > driver. From Lukas Wunner <lukas@xxxxxxxxx>: > > > > The names of port service devices previously used one nibble to encode > > the port type and another nibble to encode the service type. Since this > > commit introduces a fifth service type, it changes device names to use > > one *byte* to encode the service type. E.g. a hotplug port service on a > > downstream bridge was previously called pcie24 and is now called pcie204. > > > > Signed-off-by: Keith Busch <keith.busch@xxxxxxxxx> > > Cc: Lukas Wunner <lukas@xxxxxxxxx> > > Applied to pci/dpc for v4.7, thanks, Keith. > > > +static void dpc_remove(struct pcie_device *dev) > > +{ > > + struct dpc_dev *dpc = get_service_data(dev); > > + struct pci_dev *pdev = dev->port; > > + u16 ctl; > > + > > + pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, &ctl); > > + ctl |= ~(PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN); > > This looks like a typo; I assume you meant: > > ctl &= ~(PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN); > > so we *clear* (not set) these bits on removal. I made this change on > my branch. Hi Keith, can you double-check and confirm that this was indeed a typo and that what's in my next branch is correct? https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=next&id=26e515713342b6f7c553aa3c66b21c6ab7cf82af -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
