Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07ae842 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' into next 

* pci/virtualization:
  PCI: Expose ari_enabled in sysfs
  PCI: Add function 1 DMA alias quirk for Marvell 9128
  PCI: Mark Ceton InfiniTV4 INTx masking as broken
  xen/pci: Use acpi_noirq_set() helper to avoid #ifdef
parents 01f095e4 0077a845

arch/x86/pci/xen.c

+1 −3
Original line number Diff line number Diff line
@@ -409,10 +409,8 @@ int __init pci_xen_init(void) 
	pcibios_enable_irq = xen_pcifront_enable_irq;

	pcibios_disable_irq = NULL;



#ifdef CONFIG_ACPI

	/* Keep ACPI out of the picture */

	acpi_noirq = 1;

#endif

	acpi_noirq_set();



#ifdef CONFIG_PCI_MSI

	x86_msi.setup_msi_irqs = xen_setup_msi_irqs;

drivers/pci/pci-sysfs.c

+11 −0
Original line number Diff line number Diff line
@@ -278,6 +278,16 @@ static ssize_t subordinate_bus_number_show(struct device *dev, 
}

static DEVICE_ATTR_RO(subordinate_bus_number);



static ssize_t ari_enabled_show(struct device *dev,

				struct device_attribute *attr,

				char *buf)

{

	struct pci_dev *pci_dev = to_pci_dev(dev);



	return sprintf(buf, "%u\n", pci_ari_enabled(pci_dev->bus));

}

static DEVICE_ATTR_RO(ari_enabled);



static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,

			     char *buf)

{
@@ -786,6 +796,7 @@ static struct attribute *pci_dev_attrs[] = { 
	&dev_attr_devspec.attr,

#endif

	&dev_attr_driver_override.attr,

	&dev_attr_ari_enabled.attr,

	NULL,

};

drivers/pci/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -3213,6 +3213,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x0030, 
			quirk_broken_intx_masking);

DECLARE_PCI_FIXUP_FINAL(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */

			quirk_broken_intx_masking);

DECLARE_PCI_FIXUP_FINAL(0x1b7c, 0x0004, /* Ceton InfiniTV4 */

			quirk_broken_intx_masking);



/*

 * Realtek RTL8169 PCI Gigabit Ethernet Controller (rev 10)
@@ -3877,6 +3879,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9120, 
			 quirk_dma_func1_alias);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9123,

			 quirk_dma_func1_alias);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9128,

			 quirk_dma_func1_alias);

/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c14 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9130,

			 quirk_dma_func1_alias);