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

Commit f3c2352d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Enumeration
    - Scan all device numbers on NEC as well as Stratus (Charlotte Richardson)

  Resource management
    - Handle read-only BARs on AMD CS553x devices (Myron Stowe)

  Synopsys DesignWare
    - Reject MSI-X IRQs (Lucas Stach)"

* tag 'pci-v3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Handle read-only BARs on AMD CS553x devices
  PCI: Add NEC variants to Stratus ftServer PCIe DMI check
  PCI: designware: Reject MSI-X IRQs
parents 5ee0e962 06cf35f9

arch/x86/pci/common.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -448,6 +448,22 @@ static const struct dmi_system_id pciprobe_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"),

		},

		},

	},

	},

        {

                .callback = set_scan_all,

                .ident = "Stratus/NEC ftServer",

                .matches = {

                        DMI_MATCH(DMI_SYS_VENDOR, "NEC"),

                        DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R32"),

                },

        },

        {

                .callback = set_scan_all,

                .ident = "Stratus/NEC ftServer",

                .matches = {

                        DMI_MATCH(DMI_SYS_VENDOR, "NEC"),

                        DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R31"),

                },

        },

	{}

	{}

};

};

drivers/pci/host/pcie-designware.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,9 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev, 
	struct msi_msg msg;

	struct msi_msg msg;

	struct pcie_port *pp = sys_to_pcie(pdev->bus->sysdata);

	struct pcie_port *pp = sys_to_pcie(pdev->bus->sysdata);





	if (desc->msi_attrib.is_msix)

		return -EINVAL;



	irq = assign_irq(1, desc, &pos);

	irq = assign_irq(1, desc, &pos);

	if (irq < 0)

	if (irq < 0)

		return irq;

		return irq;

drivers/pci/quirks.c

+37 −3
Original line number Original line Diff line number Diff line
@@ -324,18 +324,52 @@ static void quirk_s3_64M(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M);





static void quirk_io(struct pci_dev *dev, int pos, unsigned size,

		     const char *name)

{

	u32 region;

	struct pci_bus_region bus_region;

	struct resource *res = dev->resource + pos;



	pci_read_config_dword(dev, PCI_BASE_ADDRESS_0 + (pos << 2), &region);



	if (!region)

		return;



	res->name = pci_name(dev);

	res->flags = region & ~PCI_BASE_ADDRESS_IO_MASK;

	res->flags |=

		(IORESOURCE_IO | IORESOURCE_PCI_FIXED | IORESOURCE_SIZEALIGN);

	region &= ~(size - 1);



	/* Convert from PCI bus to resource space */

	bus_region.start = region;

	bus_region.end = region + size - 1;

	pcibios_bus_to_resource(dev->bus, res, &bus_region);



	dev_info(&dev->dev, FW_BUG "%s quirk: reg 0x%x: %pR\n",

		 name, PCI_BASE_ADDRESS_0 + (pos << 2), res);

}



/*

/*

 * Some CS5536 BIOSes (for example, the Soekris NET5501 board w/ comBIOS

 * Some CS5536 BIOSes (for example, the Soekris NET5501 board w/ comBIOS

 * ver. 1.33  20070103) don't set the correct ISA PCI region header info.

 * ver. 1.33  20070103) don't set the correct ISA PCI region header info.

 * BAR0 should be 8 bytes; instead, it may be set to something like 8k

 * BAR0 should be 8 bytes; instead, it may be set to something like 8k

 * (which conflicts w/ BAR1's memory range).

 * (which conflicts w/ BAR1's memory range).

 *

 * CS553x's ISA PCI BARs may also be read-only (ref:

 * https://bugzilla.kernel.org/show_bug.cgi?id=85991 - Comment #4 forward).

 */

 */

static void quirk_cs5536_vsa(struct pci_dev *dev)

static void quirk_cs5536_vsa(struct pci_dev *dev)

{

{

	static char *name = "CS5536 ISA bridge";



	if (pci_resource_len(dev, 0) != 8) {

	if (pci_resource_len(dev, 0) != 8) {

		struct resource *res = &dev->resource[0];

		quirk_io(dev, 0,   8, name);	/* SMB */

		res->end = res->start + 8 - 1;

		quirk_io(dev, 1, 256, name);	/* GPIO */

		dev_info(&dev->dev, "CS5536 ISA bridge bug detected (incorrect header); workaround applied\n");

		quirk_io(dev, 2,  64, name);	/* MFGPT */

		dev_info(&dev->dev, "%s bug detected (incorrect header); workaround applied\n",

			 name);

	}

	}

}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);