On Tue, Nov 19, 2013 at 09:54:58AM +0800, Yijing Wang wrote: > > The pcie_portdrv .probe() method calls pci_enable_device() once, in > > pcie_port_device_register(), but the .remove() method calls > > pci_disable_device() twice, in pcie_port_device_remove() and in > > pcie_portdrv_remove(). > > > > That causes a "disabling already-disabled device" warning when removing a > > PCIe port device. This happens all the time when removing Thunderbolt > > devices, but is also easy to reproduce with, e.g., > > "echo 0000:00:1c.3 > /sys/bus/pci/drivers/pcieport/unbind" > > > > This patch removes the disable from pcie_portdrv_remove(). > > > > [bhelgaas: changelog, tag for stable] > > Reported-by: David Bulkow <David.Bulkow@xxxxxxxxxxx> > > Reported-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> > > Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> > > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > CC: stable@xxxxxxxxxxxxxxx # v2.6.32+ > > Hi Bjorn, > This issue in X86 seems to be introduced after commit 928bea9 "PCI: Delay enabling bridges until they're needed" > So this patch needs to back port to 2.6.32+ ? 928bea9 might have made it more visible, but the underlying problem is that we enable the device once in the probe path, and disable it twice in the remove path. That problem exists in 2.6.32.61: pcie_portdrv_probe # .probe() method pcie_port_device_register pci_enable_device <-- enable pcie_portdrv_remove # .remove() method pcie_port_device_remove pci_disable_device <-- disable #1 pci_disable_device <-- disable #2 Bjorn -- 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