From: Richard Zhu hongxing.zhu@nxp.com
[ Upstream commit ce0c43e855c7f652b6351110aaaabf9b521debd7 ]
ERR051624: The Controller Without Vaux Cannot Exit L23 Ready Through Beacon or PERST# De-assertion
When the auxiliary power is not available, the controller cannot exit from L23 Ready with beacon or PERST# de-assertion when main power is not removed. So the workaround is to set SS_RW_REG_1[SYS_AUX_PWR_DET] to 1.
This workaround is required irrespective of whether Vaux is supplied to the link partner or not.
Signed-off-by: Richard Zhu hongxing.zhu@nxp.com [mani: subject and description rewording] Signed-off-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org Reviewed-by: Frank Li Frank.Li@nxp.com Reviewed-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org Link: https://patch.msgid.link/20250416081314.3929794-5-hongxing.zhu@nxp.com Signed-off-by: Sasha Levin sashal@kernel.org ---
**YES**
This commit should be backported to stable kernel trees. Here's my extensive analysis:
## **Primary Justification: Hardware Errata Fix**
**ERR051624** is a documented silicon-level hardware errata affecting i.MX95 PCIe controllers. The commit message clearly states this is a workaround for a fundamental hardware limitation where "the controller cannot exit from L23 Ready with beacon or PERST# de-assertion when main power is not removed" when auxiliary power is unavailable.
## **Code Analysis**
The changes are **minimal and targeted**:
```c + /* + * ERR051624: The Controller Without Vaux Cannot Exit L23 Ready + * Through Beacon or PERST# De-assertion + * + * When the auxiliary power is not available, the controller + * cannot exit from L23 Ready with beacon or PERST# de-assertion + * when main power is not removed. + * + * Workaround: Set SS_RW_REG_1[SYS_AUX_PWR_DET] to 1. + */ + regmap_set_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_1, + IMX95_PCIE_SYS_AUX_PWR_DET); ```
The fix is: - **Self-contained**: Only affects i.MX95 PCIe initialization path (`imx95_pcie_init_phy`) - **Low risk**: Simple register bit set with no complex logic - **Well-documented**: Includes detailed errata description and official workaround - **Hardware-specific**: No impact on other platforms or subsystems
## **Impact Assessment**
This errata affects **critical system functionality**: - **Power Management**: Prevents proper exit from L23 Ready state - **System Resume**: Could cause hangs during suspend/resume cycles - **Platform Stability**: Affects fundamental PCIe power state transitions
## **Historical Precedent**
Examining similar commits shows a **consistent pattern of hardware errata backporting**:
1. **Similar Commit #4 (Status: YES)**: "PCI: dwc: Provide deinit callback for i.MX" - Also addresses i.MX PCIe initialization issues and was backported 2. **ERR005723 workaround**: Recently backported to stable (`Cc: stable@vger.kernel.org`) 3. **ERR010728 workaround**: Multiple commits addressing this errata, showing active stable maintenance
## **Stable Tree Criteria Compliance**
✅ **Important bugfix**: Addresses hardware limitation affecting system power management ✅ **Minimal risk**: Single register bit set with no side effects ✅ **Small and contained**: 13 lines of code, confined to one function ✅ **No architectural changes**: Simple workaround implementation ✅ **Critical subsystem**: PCIe power management is fundamental to system operation ✅ **Clear documentation**: Well-documented errata with official workaround
## **Risk Analysis**
**Regression Risk: MINIMAL** - Only affects i.MX95 platforms specifically - Workaround is mandated by hardware vendor (NXP) - No conditional logic that could fail - Register bit set follows official errata documentation
## **Maintainer Pattern**
The i.MX PCIe driver maintainers (Richard Zhu/NXP, Manivannan Sadhasivam) have consistently tagged hardware errata fixes for stable backporting, demonstrating their commitment to stable kernel support for production hardware issues.
## **Conclusion**
This commit represents a **mandatory workaround for broken hardware** that affects basic system functionality (power management). It follows established patterns of similar errata fixes that have been successfully backported, poses minimal regression risk, and addresses a real-world issue that would impact users of i.MX95-based systems in production environments.
drivers/pci/controller/dwc/pci-imx6.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 90ace941090f9..38f14b5f50f02 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -49,6 +49,8 @@ #define IMX95_PCIE_SS_RW_REG_0 0xf0 #define IMX95_PCIE_REF_CLKEN BIT(23) #define IMX95_PCIE_PHY_CR_PARA_SEL BIT(9) +#define IMX95_PCIE_SS_RW_REG_1 0xf4 +#define IMX95_PCIE_SYS_AUX_PWR_DET BIT(31)
#define IMX95_PE0_GEN_CTRL_1 0x1050 #define IMX95_PCIE_DEVICE_TYPE GENMASK(3, 0) @@ -228,6 +230,19 @@ static unsigned int imx_pcie_grp_offset(const struct imx_pcie *imx_pcie)
static int imx95_pcie_init_phy(struct imx_pcie *imx_pcie) { + /* + * ERR051624: The Controller Without Vaux Cannot Exit L23 Ready + * Through Beacon or PERST# De-assertion + * + * When the auxiliary power is not available, the controller + * cannot exit from L23 Ready with beacon or PERST# de-assertion + * when main power is not removed. + * + * Workaround: Set SS_RW_REG_1[SYS_AUX_PWR_DET] to 1. + */ + regmap_set_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_1, + IMX95_PCIE_SYS_AUX_PWR_DET); + regmap_update_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_0, IMX95_PCIE_PHY_CR_PARA_SEL,