On Thu, Nov 17, 2016 at 05:29:54PM -0600, Bjorn Helgaas wrote: > Maybe the third time is the charm. This is basically the v1 you posted, > but I added an mlx4 update to use the new device ID definitions. That way > grep and cscope will find the ID both places, so we can match the quirk > with the related driver. > > This is on the pci/virtualization branch. And I did build it this time. > > v2 -> v3 > - Add device ID definitions to pci_ids.h (from original patch of Nov 1) > - Use new definitions in mlx4 driver (new patch) > - Use new definitions in quirks (as in v1 patches) > > v1 -> v2 (pushed to pci/virtualization branch but not posted on list) > - Bjorn removed device ID definitions (which broke build) > - Bjorn reordered so Mellanox wasn't in the middle of other quirk list > - Bjorn moved pci_disable_device() to end of quirk > > v0 -> v1 > Fixes according to Gavin Shan's comments: > - Patch numbering was wrong > - Fixed logic of mellanox_check_broken_intx_masking > > --- > > Bjorn Helgaas (1): > net/mlx4_core: Use device ID defines > > Noa Osherovich (4): > PCI: Add Mellanox device IDs > PCI: Convert broken INTx masking quirks from HEADER to FINAL > PCI: Convert Mellanox broken INTx quirks to be for listed devices only > PCI: Support INTx masking on ConnectX-4 with firmware x.14.1100+ > > > drivers/net/ethernet/mellanox/mlx4/main.c | 78 +++++++------- > drivers/pci/quirks.c | 159 ++++++++++++++++++++++------- > include/linux/pci_ids.h | 27 ++++- > 3 files changed, 181 insertions(+), 83 deletions(-) I added Tariq's ack on "net/mlx4_core: Use device ID defines" and applied these on pci/virtualization for v4.10. -- 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