Skip to contentSkip to conversation

pci: Add defines for normal and subtractive PCI bridges

PATCH In review Pali Rohár 3 participants 3 messages Feb 18, 2022 – Mar 25, 2022

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pci: Add defines for normal and subtractive PCI bridges

Add following two new PCI class codes defines into pci_ids.h include file:

PCI_CLASS_BRIDGE_PCI_NORMAL
PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE

And use these defines in all U-Boot code for describing PCI class codes for normal and subtractive PCI bridges.

---
Same macros were included also into Linux kernel pci_ids.h file:
https://lore.kernel.org/linux-pci/20220217213218.GA307343@bhelgaas/

---
 board/armltd/vexpress64/pcie.c | 2 +-
 drivers/pci/pci-aardvark.c     | 2 +-
 drivers/pci/pci-rcar-gen3.c    | 2 +-
 drivers/pci/pci_mvebu.c        | 2 +-
 drivers/pci/pci_tegra.c        | 4 ++--
 drivers/pci/pcie_dw_mvebu.c    | 4 ++--
 drivers/pci/pcie_fsl.c         | 2 +-
 drivers/pci/pcie_imx.c         | 4 ++--
 drivers/pci/pcie_iproc.c       | 2 +-
 drivers/pci/pcie_rockchip.c    | 2 +-
 include/pci_ids.h              | 2 ++
 11 files changed, 15 insertions(+), 13 deletions(-)
board/armltd/vexpress64/pcie.c +1 -1
index 1e74158630b5..e553da86e0e0 100644
@@ -150,7 +150,7 @@ static void xr3pci_init(void)
 	/* allow ECRC */
 	writel(0x6006, XR3_CONFIG_BASE + XR3PCI_PEX_SPC2);
 	/* setup the correct class code for the host bridge */
-	writel(PCI_CLASS_BRIDGE_PCI << 16, XR3_CONFIG_BASE + XR3PCI_BRIDGE_PCI_IDS);
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8, XR3_CONFIG_BASE + XR3PCI_BRIDGE_PCI_IDS);
 
 	/* reset phy and root complex */
 	writel(JUNO_RESET_CTRL_PHY | JUNO_RESET_CTRL_RC,
drivers/pci/pci-aardvark.c +1 -1
index 4f7e61ecf166..b0fc9caabbec 100644
@@ -800,7 +800,7 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
 	 */
 	reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 	reg &= ~0xffffff00;
-	reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
+	reg |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
 	advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 
 	/* Enable generation and checking of ECRC on PCIe Root Port */
drivers/pci/pci-rcar-gen3.c +1 -1
index 34a561ef8b4b..49029238d350 100644
@@ -289,7 +289,7 @@ static int rcar_gen3_pcie_hw_init(struct udevice *dev)
 	 * class to match. Hardware takes care of propagating the IDSETR
 	 * settings, so there is no need to bother with a quirk.
 	 */
-	writel(PCI_CLASS_BRIDGE_PCI << 16, priv->regs + IDSETR1);
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8, priv->regs + IDSETR1);
 
 	/*
 	 * Setup Secondary Bus Number & Subordinate Bus Number, even though
drivers/pci/pci_mvebu.c +1 -1
index f47a0a9ea36b..2de2a5430b22 100644
@@ -514,7 +514,7 @@ static int mvebu_pcie_probe(struct udevice *dev)
 	 */
 	reg = readl(pcie->base + MVPCIE_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 	reg &= ~0xffffff00;
-	reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
+	reg |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
 	writel(reg, pcie->base + MVPCIE_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 
 	/*
drivers/pci/pci_tegra.c +2 -2
index fc05ee00f1fc..f8d66c0e1c6a 100644
@@ -325,8 +325,8 @@ static int pci_tegra_read_config(const struct udevice *bus, pci_dev_t bdf,
 	/* fixup root port class */
 	if (PCI_BUS(bdf) == 0) {
 		if ((offset & ~3) == PCI_CLASS_REVISION) {
-			value &= ~0x00ff0000;
-			value |= PCI_CLASS_BRIDGE_PCI << 16;
+			value &= ~0x00ffff00;
+			value |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
 		}
 	}
 #endif
drivers/pci/pcie_dw_mvebu.c +2 -2
index 0490fd337705..99891dce61d5 100644
@@ -539,9 +539,9 @@ static int pcie_dw_mvebu_probe(struct udevice *dev)
 				  PCIE_ATU_TYPE_MEM, pcie->mem.phys_start,
 				  pcie->mem.bus_start, pcie->mem.size);
 
-	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI */
+	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI_NORMAL */
 	clrsetbits_le32(pcie->ctrl_base + PCI_CLASS_REVISION,
-			0xffff << 16, PCI_CLASS_BRIDGE_PCI << 16);
+			0xffffff << 8, PCI_CLASS_BRIDGE_PCI_NORMAL << 8);
 
 	pcie_dw_set_host_bars(pcie->ctrl_base);
 
drivers/pci/pcie_fsl.c +1 -1
index cc6efdd5b464..f5ba34970f15 100644
@@ -532,7 +532,7 @@ static int fsl_pcie_fixup_classcode(struct fsl_pcie *pcie)
 
 	fsl_pcie_hose_read_config_dword(pcie, classcode_reg, &val);
 	val &= 0xff;
-	val |= PCI_CLASS_BRIDGE_PCI << 16;
+	val |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
 	fsl_pcie_hose_write_config_dword(pcie, classcode_reg, val);
 
 	if (pcie->block_rev >= PEX_IP_BLK_REV_3_0)
drivers/pci/pcie_imx.c +2 -2
index 756166fd3eaa..2cec3900e9ad 100644
@@ -300,9 +300,9 @@ static int imx_pcie_regions_setup(struct imx_pcie_priv *priv)
 	setbits_le32(priv->dbi_base + PCI_COMMAND,
 		     PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
 
-	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI */
+	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI_NORMAL */
 	setbits_le32(priv->dbi_base + PCI_CLASS_REVISION,
-		     PCI_CLASS_BRIDGE_PCI << 16);
+		     PCI_CLASS_BRIDGE_PCI_NORMAL << 8);
 
 	/* Region #0 is used for Outbound CFG space access. */
 	writel(0, priv->dbi_base + PCIE_ATU_VIEWPORT);
drivers/pci/pcie_iproc.c +1 -1
index 85dfab5c720f..d6d3a9e20250 100644
@@ -1123,7 +1123,7 @@ static int iproc_pcie_check_link(struct iproc_pcie *pcie)
 				    PCI_BRIDGE_CTRL_REG_OFFSET,
 				    4, &class);
 	class &= ~PCI_BRIDGE_CTRL_REG_CLASS_MASK;
-	class |= (PCI_CLASS_BRIDGE_PCI << 8);
+	class |= PCI_CLASS_BRIDGE_PCI_NORMAL;
 	iproc_pci_raw_config_write32(pcie, 0,
 				     PCI_BRIDGE_CTRL_REG_OFFSET,
 				     4, class);
drivers/pci/pcie_rockchip.c +1 -1
index 67039d2a29f8..72b41398f27b 100644
@@ -351,7 +351,7 @@ static int rockchip_pcie_init_port(struct udevice *dev)
 
 	/* Initialize Root Complex registers. */
 	writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
-	writel(PCI_CLASS_BRIDGE_PCI << 16,
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8,
 	       priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
 	writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
 	       priv->apb_base + PCIE_LM_RCBAR);
include/pci_ids.h +2 -0
index 3c5434c0eda8..88b0a6404585 100644
@@ -55,6 +55,8 @@
 #define PCI_CLASS_BRIDGE_EISA		0x0602
 #define PCI_CLASS_BRIDGE_MC		0x0603
 #define PCI_CLASS_BRIDGE_PCI		0x0604
+#define PCI_CLASS_BRIDGE_PCI_NORMAL		0x060400
+#define PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE	0x060401
 #define PCI_CLASS_BRIDGE_PCMCIA		0x0605
 #define PCI_CLASS_BRIDGE_NUBUS		0x0606
 #define PCI_CLASS_BRIDGE_CARDBUS	0x0607
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Pali Rohár

Add following two new PCI class codes defines into pci_ids.h include file:

PCI_CLASS_BRIDGE_PCI_NORMAL
PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE

And use these defines in all U-Boot code for describing PCI class codes for normal and subtractive PCI bridges.

Thanks,
Stefan

Quoted 160 lines

---
Same macros were included also into Linux kernel pci_ids.h file:
https://lore.kernel.org/linux-pci/20220217213218.GA307343@bhelgaas/

---
  board/armltd/vexpress64/pcie.c | 2 +-
  drivers/pci/pci-aardvark.c     | 2 +-
  drivers/pci/pci-rcar-gen3.c    | 2 +-
  drivers/pci/pci_mvebu.c        | 2 +-
  drivers/pci/pci_tegra.c        | 4 ++--
  drivers/pci/pcie_dw_mvebu.c    | 4 ++--
  drivers/pci/pcie_fsl.c         | 2 +-
  drivers/pci/pcie_imx.c         | 4 ++--
  drivers/pci/pcie_iproc.c       | 2 +-
  drivers/pci/pcie_rockchip.c    | 2 +-
  include/pci_ids.h              | 2 ++
  11 files changed, 15 insertions(+), 13 deletions(-)
board/armltd/vexpress64/pcie.c +1 -1
index 1e74158630b5..e553da86e0e0 100644
@@ -150,7 +150,7 @@ static void xr3pci_init(void)
  	/* allow ECRC */
  	writel(0x6006, XR3_CONFIG_BASE + XR3PCI_PEX_SPC2);
  	/* setup the correct class code for the host bridge */
-	writel(PCI_CLASS_BRIDGE_PCI << 16, XR3_CONFIG_BASE + XR3PCI_BRIDGE_PCI_IDS);
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8, XR3_CONFIG_BASE + XR3PCI_BRIDGE_PCI_IDS);
 
  	/* reset phy and root complex */
  	writel(JUNO_RESET_CTRL_PHY | JUNO_RESET_CTRL_RC,
drivers/pci/pci-aardvark.c +1 -1
index 4f7e61ecf166..b0fc9caabbec 100644
@@ -800,7 +800,7 @@ static int pcie_advk_setup_hw(struct pcie_advk *pcie)
  	 */
  	reg = advk_readl(pcie, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
  	reg &= ~0xffffff00;
-	reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
+	reg |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
  	advk_writel(pcie, reg, ADVK_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 
  	/* Enable generation and checking of ECRC on PCIe Root Port */
drivers/pci/pci-rcar-gen3.c +1 -1
index 34a561ef8b4b..49029238d350 100644
@@ -289,7 +289,7 @@ static int rcar_gen3_pcie_hw_init(struct udevice *dev)
  	 * class to match. Hardware takes care of propagating the IDSETR
  	 * settings, so there is no need to bother with a quirk.
  	 */
-	writel(PCI_CLASS_BRIDGE_PCI << 16, priv->regs + IDSETR1);
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8, priv->regs + IDSETR1);
 
  	/*
  	 * Setup Secondary Bus Number & Subordinate Bus Number, even though
drivers/pci/pci_mvebu.c +1 -1
index f47a0a9ea36b..2de2a5430b22 100644
@@ -514,7 +514,7 @@ static int mvebu_pcie_probe(struct udevice *dev)
  	 */
  	reg = readl(pcie->base + MVPCIE_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
  	reg &= ~0xffffff00;
-	reg |= (PCI_CLASS_BRIDGE_PCI << 8) << 8;
+	reg |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
  	writel(reg, pcie->base + MVPCIE_ROOT_PORT_PCI_CFG_OFF + PCI_CLASS_REVISION);
 
  	/*
drivers/pci/pci_tegra.c +2 -2
index fc05ee00f1fc..f8d66c0e1c6a 100644
@@ -325,8 +325,8 @@ static int pci_tegra_read_config(const struct udevice *bus, pci_dev_t bdf,
  	/* fixup root port class */
  	if (PCI_BUS(bdf) == 0) {
  		if ((offset & ~3) == PCI_CLASS_REVISION) {
-			value &= ~0x00ff0000;
-			value |= PCI_CLASS_BRIDGE_PCI << 16;
+			value &= ~0x00ffff00;
+			value |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
  		}
  	}
  #endif
drivers/pci/pcie_dw_mvebu.c +2 -2
index 0490fd337705..99891dce61d5 100644
@@ -539,9 +539,9 @@ static int pcie_dw_mvebu_probe(struct udevice *dev)
  				  PCIE_ATU_TYPE_MEM, pcie->mem.phys_start,
  				  pcie->mem.bus_start, pcie->mem.size);
 
-	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI */
+	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI_NORMAL */
  	clrsetbits_le32(pcie->ctrl_base + PCI_CLASS_REVISION,
-			0xffff << 16, PCI_CLASS_BRIDGE_PCI << 16);
+			0xffffff << 8, PCI_CLASS_BRIDGE_PCI_NORMAL << 8);
 
  	pcie_dw_set_host_bars(pcie->ctrl_base);
 
drivers/pci/pcie_fsl.c +1 -1
index cc6efdd5b464..f5ba34970f15 100644
@@ -532,7 +532,7 @@ static int fsl_pcie_fixup_classcode(struct fsl_pcie *pcie)
 
  	fsl_pcie_hose_read_config_dword(pcie, classcode_reg, &val);
  	val &= 0xff;
-	val |= PCI_CLASS_BRIDGE_PCI << 16;
+	val |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8;
  	fsl_pcie_hose_write_config_dword(pcie, classcode_reg, val);
 
  	if (pcie->block_rev >= PEX_IP_BLK_REV_3_0)
drivers/pci/pcie_imx.c +2 -2
index 756166fd3eaa..2cec3900e9ad 100644
@@ -300,9 +300,9 @@ static int imx_pcie_regions_setup(struct imx_pcie_priv *priv)
  	setbits_le32(priv->dbi_base + PCI_COMMAND,
  		     PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
 
-	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI */
+	/* Set the CLASS_REV of RC CFG header to PCI_CLASS_BRIDGE_PCI_NORMAL */
  	setbits_le32(priv->dbi_base + PCI_CLASS_REVISION,
-		     PCI_CLASS_BRIDGE_PCI << 16);
+		     PCI_CLASS_BRIDGE_PCI_NORMAL << 8);
 
  	/* Region #0 is used for Outbound CFG space access. */
  	writel(0, priv->dbi_base + PCIE_ATU_VIEWPORT);
drivers/pci/pcie_iproc.c +1 -1
index 85dfab5c720f..d6d3a9e20250 100644
@@ -1123,7 +1123,7 @@ static int iproc_pcie_check_link(struct iproc_pcie *pcie)
  				    PCI_BRIDGE_CTRL_REG_OFFSET,
  				    4, &class);
  	class &= ~PCI_BRIDGE_CTRL_REG_CLASS_MASK;
-	class |= (PCI_CLASS_BRIDGE_PCI << 8);
+	class |= PCI_CLASS_BRIDGE_PCI_NORMAL;
  	iproc_pci_raw_config_write32(pcie, 0,
  				     PCI_BRIDGE_CTRL_REG_OFFSET,
  				     4, class);
drivers/pci/pcie_rockchip.c +1 -1
index 67039d2a29f8..72b41398f27b 100644
@@ -351,7 +351,7 @@ static int rockchip_pcie_init_port(struct udevice *dev)
 
  	/* Initialize Root Complex registers. */
  	writel(PCIE_LM_VENDOR_ROCKCHIP, priv->apb_base + PCIE_LM_VENDOR_ID);
-	writel(PCI_CLASS_BRIDGE_PCI << 16,
+	writel(PCI_CLASS_BRIDGE_PCI_NORMAL << 8,
  	       priv->apb_base + PCIE_RC_BASE + PCI_CLASS_REVISION);
  	writel(PCIE_LM_RCBARPIE | PCIE_LM_RCBARPIS,
  	       priv->apb_base + PCIE_LM_RCBAR);
include/pci_ids.h +0 -0
index 3c5434c0eda8..88b0a6404585 100644

include/pci_ids.h line 62

Quoted 8 lines
include/pci_ids.h +2 -0
@@ -55,6 +55,8 @@
  #define PCI_CLASS_BRIDGE_EISA		0x0602
  #define PCI_CLASS_BRIDGE_MC		0x0603
  #define PCI_CLASS_BRIDGE_PCI		0x0604
+#define PCI_CLASS_BRIDGE_PCI_NORMAL		0x060400
+#define PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE	0x060401
  #define PCI_CLASS_BRIDGE_PCMCIA		0x0605
  #define PCI_CLASS_BRIDGE_NUBUS		0x0606
  #define PCI_CLASS_BRIDGE_CARDBUS	0x0607

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]