On Sun, Mar 30, 2014 at 5:23 PM, Ben Hutchings <[email protected]> wrote: > 3.2.56-rc1 review patch. If anyone has any objections, please let me know.
No objection, but you need the followup patch as well: 3cdeb713dc66057b50682048c151eae07b186c42 PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled > ------------------ > > From: Bjorn Helgaas <[email protected]> > > commit 1f42db786b14a31bf807fc41ee5583a00c08fcb1 upstream. > > Some firmware leaves the Interrupt Disable bit set even if the device uses > INTx interrupts. Clear Interrupt Disable so we get those interrupts. > > Based on the report mentioned below, if the user selects the "EHCI only" > option in the Intel Baytrail BIOS, the EHCI device is handed off to the OS > with the PCI_COMMAND_INTX_DISABLE bit set. > > Link: http://lkml.kernel.org/r/20140114181721.GC12126@xanatos > Link: https://bugzilla.kernel.org/show_bug.cgi?id=70601 > Reported-by: Chris Cheng <[email protected]> > Reported-and-tested-by: Jamie Chen <[email protected]> > Signed-off-by: Bjorn Helgaas <[email protected]> > CC: Sarah Sharp <[email protected]> > Signed-off-by: Ben Hutchings <[email protected]> > --- > drivers/pci/pci.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -1078,6 +1078,8 @@ EXPORT_SYMBOL_GPL(pci_load_and_free_save > static int do_pci_enable_device(struct pci_dev *dev, int bars) > { > int err; > + u16 cmd; > + u8 pin; > > err = pci_set_power_state(dev, PCI_D0); > if (err < 0 && err != -EIO) > @@ -1087,6 +1089,14 @@ static int do_pci_enable_device(struct p > return err; > pci_fixup_device(pci_fixup_enable, dev); > > + pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); > + if (pin) { > + pci_read_config_word(dev, PCI_COMMAND, &cmd); > + if (cmd & PCI_COMMAND_INTX_DISABLE) > + pci_write_config_word(dev, PCI_COMMAND, > + cmd & > ~PCI_COMMAND_INTX_DISABLE); > + } > + > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
