Skip to content

Commit 91e5d15

Browse files
jamesequinlankwilczynski
authored andcommitted
PCI: brcmstb: Enable 7712 SoCs
The Broadcom STB 7712 is the sibling chip of the RPi 5 (2712). It has one PCIe controller with a single port, supports gen2 and one lane only. The current revision of the chip is "C0" or "C1". Link: https://lore.kernel.org/linux-pci/20240815225731.40276-14-james.quinlan@broadcom.com Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com> [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Stanimir Varbanov <svarbanov@suse.de>
1 parent 8215851 commit 91e5d15

1 file changed

Lines changed: 20 additions & 0 deletions

File tree

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,10 @@ static void brcm_extend_rbus_timeout(struct brcm_pcie *pcie)
12051205
const unsigned int REG_OFFSET = PCIE_RGR1_SW_INIT_1(pcie) - 8;
12061206
u32 timeout_us = 4000000; /* 4 seconds, our setting for L1SS */
12071207

1208+
/* 7712 does not have this (RGR1) timer */
1209+
if (pcie->soc_base == BCM7712)
1210+
return;
1211+
12081212
/* Each unit in timeout register is 1/216,000,000 seconds */
12091213
writel(216 * timeout_us, pcie->base + REG_OFFSET);
12101214
}
@@ -1676,6 +1680,13 @@ static const int pcie_offsets_bmips_7425[] = {
16761680
[PCIE_INTR2_CPU_BASE] = 0x4300,
16771681
};
16781682

1683+
static const int pcie_offset_bcm7712[] = {
1684+
[EXT_CFG_INDEX] = 0x9000,
1685+
[EXT_CFG_DATA] = 0x9004,
1686+
[PCIE_HARD_DEBUG] = 0x4304,
1687+
[PCIE_INTR2_CPU_BASE] = 0x4400,
1688+
};
1689+
16791690
static const struct pcie_cfg_data generic_cfg = {
16801691
.offsets = pcie_offsets,
16811692
.soc_base = GENERIC,
@@ -1741,6 +1752,14 @@ static const struct pcie_cfg_data bcm7216_cfg = {
17411752
.num_inbound_wins = 3,
17421753
};
17431754

1755+
static const struct pcie_cfg_data bcm7712_cfg = {
1756+
.offsets = pcie_offset_bcm7712,
1757+
.perst_set = brcm_pcie_perst_set_7278,
1758+
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
1759+
.soc_base = BCM7712,
1760+
.num_inbound_wins = 10,
1761+
};
1762+
17441763
static const struct of_device_id brcm_pcie_match[] = {
17451764
{ .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg },
17461765
{ .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg },
@@ -1750,6 +1769,7 @@ static const struct of_device_id brcm_pcie_match[] = {
17501769
{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
17511770
{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
17521771
{ .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
1772+
{ .compatible = "brcm,bcm7712-pcie", .data = &bcm7712_cfg },
17531773
{},
17541774
};
17551775

0 commit comments

Comments
 (0)