Commit fde14ee6 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/bridge-class-codes' 

- Add and use #defines for normal and subtractive PCI bridges (Pali Rohár)

- Set all 24 bits of PCI class code for iproc (Pali Rohár)

* pci/bridge-class-codes:
  PCI: iproc: Set all 24 bits of PCI class code
  PCI: Add defines for normal and subtractive PCI bridges
parents 05ca7e50 fe665816

arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h

+0 −2
Original line number Diff line number Diff line
@@ -1380,8 +1380,6 @@ 


#define PCIE_IDVAL3_REG			0x43c

#define IDVAL3_CLASS_CODE_MASK		0xffffff

#define IDVAL3_SUBCLASS_SHIFT		8

#define IDVAL3_CLASS_SHIFT		16



#define PCIE_DLSTATUS_REG		0x1048

#define DLSTATUS_PHYLINKUP		(1 << 13)

arch/mips/pci/fixup-sb1250.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI, 
 */

static void quirk_sb1250_ht(struct pci_dev *dev)

{

	dev->class = PCI_CLASS_BRIDGE_PCI << 8;

	dev->class = PCI_CLASS_BRIDGE_PCI_NORMAL;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_HT,

			quirk_sb1250_ht);

arch/mips/pci/pci-bcm63xx.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int __init bcm63xx_register_pcie(void) 
	/* setup class code as bridge */

	val = bcm_pcie_readl(PCIE_IDVAL3_REG);

	val &= ~IDVAL3_CLASS_CODE_MASK;

	val |= (PCI_CLASS_BRIDGE_PCI << IDVAL3_SUBCLASS_SHIFT);

	val |= PCI_CLASS_BRIDGE_PCI_NORMAL;

	bcm_pcie_writel(val, PCIE_IDVAL3_REG);



	/* disable bar1 size */

arch/powerpc/platforms/powernv/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ void pnv_pci_shutdown(void) 
/* Fixup wrong class code in p7ioc and p8 root complex */

static void pnv_p7ioc_rc_quirk(struct pci_dev *dev)

{

	dev->class = PCI_CLASS_BRIDGE_PCI << 8;

	dev->class = PCI_CLASS_BRIDGE_PCI_NORMAL;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IBM, 0x3b9, pnv_p7ioc_rc_quirk);

arch/powerpc/sysdev/fsl_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void quirk_fsl_pcie_early(struct pci_dev *dev) 
	if ((hdr_type & 0x7f) != PCI_HEADER_TYPE_BRIDGE)

		return;



	dev->class = PCI_CLASS_BRIDGE_PCI << 8;

	dev->class = PCI_CLASS_BRIDGE_PCI_NORMAL;

	fsl_pcie_bus_fixup = 1;

	return;

}