FAILED: patch "[PATCH] PCI: brcmstb: Fix disabling L0s capability" failed to apply to 6.12-stable tree
Subsystems (6)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 9583f9d22991d2cfb5cc59a2552040c4ae98d998
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010519-syndrome-eccentric-90f2@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 9583f9d22991d2cfb5cc59a2552040c4ae98d998 Mon Sep 17 00:00:00 2001
From: Jim Quinlan <[email protected]>
Date: Fri, 3 Oct 2025 13:04:36 -0400
Subject: [PATCH] PCI: brcmstb: Fix disabling L0s capability
caab002d5069 ("PCI: brcmstb: Disable L0s component of ASPM if requested") set PCI_EXP_LNKCAP_ASPM_L1 and (optionally) PCI_EXP_LNKCAP_ASPM_L0S in PCI_EXP_LNKCAP (aka PCIE_RC_CFG_PRIV1_LINK_CAPABILITY in brcmstb).
But instead of using PCI_EXP_LNKCAP_ASPM_L1 and PCI_EXP_LNKCAP_ASPM_L0S directly, it used PCIE_LINK_STATE_L1 and PCIE_LINK_STATE_L0S, which are Linux-created values that only coincidentally matched the PCIe spec. b478e162f227 ("PCI/ASPM: Consolidate link state defines") later changed them so they no longer matched the PCIe spec, so the bits ended up in the wrong place in PCI_EXP_LNKCAP.
Use PCI_EXP_LNKCAP_ASPM_L0S to clear L0s support when there's an 'aspm-no-l0s' property. Rely on brcmstb hardware to advertise L0s and/or L1 support otherwise.
drivers/pci/controller/pcie-brcmstb.c +3 -7
@@ -48,7 +48,6 @@#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY 0x04dc#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_WIDTH_MASK 0x1f0 -#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK 0xc00#define PCIE_RC_CFG_PRIV1_ROOT_CAP 0x4f8#define PCIE_RC_CFG_PRIV1_ROOT_CAP_L1SS_MODE_MASK 0xf8
@@ -1075,7 +1074,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)void __iomem *base = pcie->base;struct pci_host_bridge *bridge;struct resource_entry *entry; -u32 tmp, burst, aspm_support, num_lanes, num_lanes_cap; +u32 tmp, burst, num_lanes, num_lanes_cap;u8 num_out_wins =0 ;int num_inbound_wins =0 ;int memc, ret;
@@ -1175,12 +1174,9 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)/* Don't advertise L0s capability if 'aspm-no-l0s' */ - aspm_support =PCIE_LINK_STATE_L1 ; -if (!of_property_read_bool (pcie->np,"aspm-no-l0s" )) - aspm_support |=PCIE_LINK_STATE_L0S ; tmp =readl (base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY ); -u32p_replace_bits (&tmp, aspm_support, -PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK ); +if (of_property_read_bool (pcie->np,"aspm-no-l0s" )) + tmp &= ~PCI_EXP_LNKCAP_ASPM_L0S ;writel (tmp, base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY );/* 'tmp' still holds the contents of PRIV1_LINK_CAPABILITY */
Sasha Levin
maintainerPATCH 1/3 PCI: brcmstb: Reuse pcie_cfg_data structure
From: Stanimir Varbanov <[email protected]>
[ Upstream commit 10dbedad3c8188ce8b68559d43b7aaee7dafba25 ]
Instead of copying fields from the pcie_cfg_data structure to brcm_pcie, reference it directly.
Stable-dep-of: 9583f9d22991 ("PCI: brcmstb: Fix disabling L0s capability")
--- drivers/pci/controller/pcie-brcmstb.c | 72 ++++++++++++--------------- 1 file changed, 32 insertions(+), 40 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +32 -40
@@ -191,11 +191,11 @@#define SSC_STATUS_PLL_LOCK_MASK 0x800#define PCIE_BRCM_MAX_MEMC 3 -#define IDX_ADDR (pcie) ((pcie)->reg_offsets[EXT_CFG_INDEX]) -#define DATA_ADDR (pcie) ((pcie)->reg_offsets[EXT_CFG_DATA]) -#define PCIE_RGR1_SW_INIT_1 (pcie) ((pcie)->reg_offsets[RGR1_SW_INIT_1]) -#define HARD_DEBUG (pcie) ((pcie)->reg_offsets[PCIE_HARD_DEBUG]) -#define INTR2_CPU_BASE (pcie) ((pcie)->reg_offsets[PCIE_INTR2_CPU_BASE]) +#define IDX_ADDR (pcie) ((pcie)->cfg->offsets[EXT_CFG_INDEX]) +#define DATA_ADDR (pcie) ((pcie)->cfg->offsets[EXT_CFG_DATA]) +#define PCIE_RGR1_SW_INIT_1 (pcie) ((pcie)->cfg->offsets[RGR1_SW_INIT_1]) +#define HARD_DEBUG (pcie) ((pcie)->cfg->offsets[PCIE_HARD_DEBUG]) +#define INTR2_CPU_BASE (pcie) ((pcie)->cfg->offsets[PCIE_INTR2_CPU_BASE])/* Rescal registers */ #define PCIE_DVT_PMU_PCIE_PHY_CTRL 0xc700
@@ -276,8 +276,6 @@ struct brcm_pcie {int gen;u64 msi_target_addr;struct brcm_msi *msi; -const int *reg_offsets; -enum pcie_soc_base soc_base;struct reset_control *rescal;struct reset_control *perst_reset;struct reset_control *bridge_reset;
@@ -285,17 +283,14 @@ struct brcm_pcie {int num_memc;u64 memc_size[PCIE_BRCM_MAX_MEMC ];u32 hw_rev; -int (*perst_set)(struct brcm_pcie *pcie,u32 val); -int (*bridge_sw_init_set)(struct brcm_pcie *pcie,u32 val);struct subdev_regulators *sr;bool ep_wakeup_capable; -bool has_phy; -u8 num_inbound_wins; +const struct pcie_cfg_data *cfg; };static inline bool is_bmips (const struct brcm_pcie *pcie) { -return pcie->soc_base ==BCM7435 || pcie->soc_base ==BCM7425 ; +return pcie->cfg->soc_base ==BCM7435 || pcie->cfg->soc_base ==BCM7425 ; }/*
@@ -855,7 +850,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie,* security considerations, and is not implemented in our modern * SoCs. */ -if (pcie->soc_base !=BCM7712 ) +if (pcie->cfg->soc_base !=BCM7712 )add_inbound_win (b++, &n,0 ,0 ,0 );resource_list_for_each_entry (entry, &bridge->dma_ranges) {
@@ -872,10 +867,10 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie,* That being said, each BARs size must still be a power of * two. */ -if (pcie->soc_base ==BCM7712 ) +if (pcie->cfg->soc_base ==BCM7712 )add_inbound_win (b++, &n, size, cpu_start, pcie_start); -if (n > pcie->num_inbound_wins) +if (n > pcie->cfg->num_inbound_wins)break ; }
@@ -889,7 +884,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie,* that enables multiple memory controllers. As such, it can return * now w/o doing special configuration. */ -if (pcie->soc_base ==BCM7712 ) +if (pcie->cfg->soc_base ==BCM7712 )return n; ret = of_property_read_variable_u64_array(pcie->np, "brcm,scb-sizes", pcie->memc_size, 1,
@@ -1012,7 +1007,7 @@ static void set_inbound_win_registers(struct brcm_pcie *pcie,* 7712: * All of their BARs need to be set. */ -if (pcie->soc_base ==BCM7712 ) { +if (pcie->cfg->soc_base ==BCM7712 ) {/* BUS remap register settings */ reg_offset =brcm_ubus_reg_offset (i); tmp =lower_32_bits (cpu_addr) & ~0xfff ;
@@ -1036,15 +1031,15 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)int memc, ret;/* Reset the bridge */ - ret = pcie->bridge_sw_init_set (pcie,1 ); + ret = pcie->cfg->bridge_sw_init_set (pcie,1 );if (ret)return ret;/* Ensure that PERST# is asserted; some bootloaders may deassert it. */ -if (pcie->soc_base ==BCM2711 ) { - ret = pcie->perst_set (pcie,1 ); +if (pcie->cfg->soc_base ==BCM2711 ) { + ret = pcie->cfg->perst_set (pcie,1 );if (ret) { - pcie->bridge_sw_init_set (pcie,0 ); + pcie->cfg->bridge_sw_init_set (pcie,0 );return ret; } }
@@ -1052,7 +1047,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)usleep_range (100 ,200 );/* Take the bridge out of reset */ - ret = pcie->bridge_sw_init_set (pcie,0 ); + ret = pcie->cfg->bridge_sw_init_set (pcie,0 );if (ret)return ret;
@@ -1072,9 +1067,9 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)*/ if (is_bmips (pcie)) burst =0x1 ;/* 256 bytes */ -else if (pcie->soc_base ==BCM2711 ) +else if (pcie->cfg->soc_base ==BCM2711 ) burst =0x0 ;/* 128 bytes */ -else if (pcie->soc_base ==BCM7278 ) +else if (pcie->cfg->soc_base ==BCM7278 ) burst =0x3 ;/* 512 bytes */ else burst =0x2 ;/* 512 bytes */
@@ -1199,7 +1194,7 @@ static void brcm_extend_rbus_timeout(struct brcm_pcie *pcie)u32 timeout_us =4000000 ;/* 4 seconds, our setting for L1SS */ /* 7712 does not have this (RGR1) timer */ -if (pcie->soc_base ==BCM7712 ) +if (pcie->cfg->soc_base ==BCM7712 )return ;/* Each unit in timeout register is 1/216,000,000 seconds */
@@ -1281,7 +1276,7 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie)brcm_pcie_set_gen (pcie, pcie->gen);/* Unassert the fundamental reset */ - ret = pcie->perst_set (pcie,0 ); + ret = pcie->cfg->perst_set (pcie,0 );if (ret)return ret;
@@ -1465,12 +1460,12 @@ static int brcm_phy_cntl(struct brcm_pcie *pcie, const int start)static inline int brcm_phy_start (struct brcm_pcie *pcie) { -return pcie->has_phy ?brcm_phy_cntl (pcie,1 ) :0 ; +return pcie->cfg->has_phy ?brcm_phy_cntl (pcie,1 ) :0 ; }static inline int brcm_phy_stop (struct brcm_pcie *pcie) { -return pcie->has_phy ?brcm_phy_cntl (pcie,0 ) :0 ; +return pcie->cfg->has_phy ?brcm_phy_cntl (pcie,0 ) :0 ; }static int brcm_pcie_turn_off (struct brcm_pcie *pcie)
@@ -1481,7 +1476,7 @@ static int brcm_pcie_turn_off(struct brcm_pcie *pcie)if (brcm_pcie_link_up (pcie))brcm_pcie_enter_l23 (pcie);/* Assert fundamental reset */ - ret = pcie->perst_set (pcie,1 ); + ret = pcie->cfg->perst_set (pcie,1 );if (ret)return ret;
@@ -1496,7 +1491,7 @@ static int brcm_pcie_turn_off(struct brcm_pcie *pcie)writel (tmp, base +HARD_DEBUG (pcie));/* Shutdown PCIe bridge */ - ret = pcie->bridge_sw_init_set (pcie,1 ); + ret = pcie->cfg->bridge_sw_init_set (pcie,1 );return ret; }
@@ -1584,7 +1579,7 @@ static int brcm_pcie_resume_noirq(struct device *dev) goto err_reset;/* Take bridge out of reset so we can access the SERDES reg */ - pcie->bridge_sw_init_set (pcie,0 ); + pcie->cfg->bridge_sw_init_set (pcie,0 );/* SERDES_IDDQ = 0 */ tmp =readl (base +HARD_DEBUG (pcie));
@@ -1805,12 +1800,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = &pdev->dev; pcie->np = np; - pcie->reg_offsets = data->offsets; - pcie->soc_base = data->soc_base; - pcie->perst_set = data->perst_set; - pcie->bridge_sw_init_set = data->bridge_sw_init_set; - pcie->has_phy = data->has_phy; - pcie->num_inbound_wins = data->num_inbound_wins; + pcie->cfg = data; pcie->base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (pcie->base))
@@ -1845,7 +1835,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)if (ret)return dev_err_probe (&pdev->dev, ret,"could not enable clock\n" ); - pcie->bridge_sw_init_set (pcie,0 ); + pcie->cfg->bridge_sw_init_set (pcie,0 );if (pcie->swinit_reset) { ret =reset_control_assert (pcie->swinit_reset);
@@ -1884,7 +1874,8 @@ static int brcm_pcie_probe(struct platform_device *pdev) goto fail; pcie->hw_rev =readl (pcie->base +PCIE_MISC_REVISION ); -if (pcie->soc_base ==BCM4908 && pcie->hw_rev >=BRCM_PCIE_HW_REV_3_20 ) { +if (pcie->cfg->soc_base ==BCM4908 && + pcie->hw_rev >=BRCM_PCIE_HW_REV_3_20 ) {dev_err (pcie->dev,"hardware revision with unsupported PERST# setup\n" ); ret = -ENODEV ; goto fail;
@@ -1904,7 +1895,8 @@ static int brcm_pcie_probe(struct platform_device *pdev) } } - bridge->ops = pcie->soc_base ==BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops; + bridge->ops = pcie->cfg->soc_base ==BCM7425 ? + &brcm7425_pcie_ops : &brcm_pcie_ops; bridge->sysdata = pcie;platform_set_drvdata (pdev, pcie);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/3 PCI: brcmstb: Set MLW based on "num-lanes" DT property if present
From: Jim Quinlan <[email protected]>
[ Upstream commit a364d10ffe361fb34c3838d33604da493045de1e ]
By default, the driver relies on the default hardware defined value for the Max Link Width (MLW) capability. But if the "num-lanes" DT property is present, assume that the chip's default capability information is incorrect or undesired, and use the specified value instead.
Stable-dep-of: 9583f9d22991 ("PCI: brcmstb: Fix disabling L0s capability")
--- drivers/pci/controller/pcie-brcmstb.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-brcmstb.c +26 -1
@@ -46,6 +46,7 @@#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK 0xffffff#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY 0x04dc +#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_WIDTH_MASK 0x1f0#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK 0xc00#define PCIE_RC_CFG_PRIV1_ROOT_CAP 0x4f8
@@ -55,6 +56,9 @@#define PCIE_RC_DL_MDIO_WR_DATA 0x1104#define PCIE_RC_DL_MDIO_RD_DATA 0x1108 +#define PCIE_RC_PL_REG_PHY_CTL_1 0x1804 +#define PCIE_RC_PL_REG_PHY_CTL_1_REG_P2_POWERDOWN_ENA_NOSYNC_MASK 0x8 +#define PCIE_MISC_MISC_CTRL 0x4008#define PCIE_MISC_MISC_CTRL_PCIE_RCB_64B_MODE_MASK 0x80#define PCIE_MISC_MISC_CTRL_PCIE_RCB_MPS_MODE_MASK 0x400
@@ -1025,7 +1029,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)void __iomem *base = pcie->base;struct pci_host_bridge *bridge;struct resource_entry *entry; -u32 tmp, burst, aspm_support; +u32 tmp, burst, aspm_support, num_lanes, num_lanes_cap;u8 num_out_wins =0 ;int num_inbound_wins =0 ;int memc, ret;
@@ -1133,6 +1137,27 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK);writel (tmp, base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY ); +/* 'tmp' still holds the contents of PRIV1_LINK_CAPABILITY */ + num_lanes_cap =u32_get_bits (tmp,PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_WIDTH_MASK ); + num_lanes =0 ; + +/* +* Use hardware negotiated Max Link Width value by default. If the +* "num-lanes" DT property is present, assume that the chip's default +* link width capability information is incorrect/undesired and use the +* specified value instead. +*/ +if (!of_property_read_u32 (pcie->np,"num-lanes" , &num_lanes) && + num_lanes && num_lanes <=4 && num_lanes_cap != num_lanes) { +u32p_replace_bits (&tmp, num_lanes, +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_WIDTH_MASK ); +writel (tmp, base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY ); + tmp =readl (base +PCIE_RC_PL_REG_PHY_CTL_1 ); +u32p_replace_bits (&tmp,1 , +PCIE_RC_PL_REG_PHY_CTL_1_REG_P2_POWERDOWN_ENA_NOSYNC_MASK ); +writel (tmp, base +PCIE_RC_PL_REG_PHY_CTL_1 ); + } +/* * For config space accesses on the RC, show the right class for * a PCIe-PCIe bridge (the default setting is to be EP mode).
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 3/3 PCI: brcmstb: Fix disabling L0s capability
In reply to Sasha LevinFrom: Jim Quinlan <[email protected]>
[ Upstream commit 9583f9d22991d2cfb5cc59a2552040c4ae98d998 ]
caab002d5069 ("PCI: brcmstb: Disable L0s component of ASPM if requested") set PCI_EXP_LNKCAP_ASPM_L1 and (optionally) PCI_EXP_LNKCAP_ASPM_L0S in PCI_EXP_LNKCAP (aka PCIE_RC_CFG_PRIV1_LINK_CAPABILITY in brcmstb).
But instead of using PCI_EXP_LNKCAP_ASPM_L1 and PCI_EXP_LNKCAP_ASPM_L0S directly, it used PCIE_LINK_STATE_L1 and PCIE_LINK_STATE_L0S, which are Linux-created values that only coincidentally matched the PCIe spec. b478e162f227 ("PCI/ASPM: Consolidate link state defines") later changed them so they no longer matched the PCIe spec, so the bits ended up in the wrong place in PCI_EXP_LNKCAP.
Use PCI_EXP_LNKCAP_ASPM_L0S to clear L0s support when there's an 'aspm-no-l0s' property. Rely on brcmstb hardware to advertise L0s and/or L1 support otherwise.
--- drivers/pci/controller/pcie-brcmstb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +3 -7
@@ -47,7 +47,6 @@#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY 0x04dc#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_WIDTH_MASK 0x1f0 -#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK 0xc00#define PCIE_RC_CFG_PRIV1_ROOT_CAP 0x4f8#define PCIE_RC_CFG_PRIV1_ROOT_CAP_L1SS_MODE_MASK 0xf8
@@ -1029,7 +1028,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)void __iomem *base = pcie->base;struct pci_host_bridge *bridge;struct resource_entry *entry; -u32 tmp, burst, aspm_support, num_lanes, num_lanes_cap; +u32 tmp, burst, num_lanes, num_lanes_cap;u8 num_out_wins =0 ;int num_inbound_wins =0 ;int memc, ret;
@@ -1129,12 +1128,9 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)/* Don't advertise L0s capability if 'aspm-no-l0s' */ - aspm_support =PCIE_LINK_STATE_L1 ; -if (!of_property_read_bool (pcie->np,"aspm-no-l0s" )) - aspm_support |=PCIE_LINK_STATE_L0S ; tmp =readl (base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY ); -u32p_replace_bits (&tmp, aspm_support, -PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK ); +if (of_property_read_bool (pcie->np,"aspm-no-l0s" )) + tmp &= ~PCI_EXP_LNKCAP_ASPM_L0S ;writel (tmp, base +PCIE_RC_CFG_PRIV1_LINK_CAPABILITY );/* 'tmp' still holds the contents of PRIV1_LINK_CAPABILITY */
Signature · 1 line
2.51.0