Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D88DD2874E4 for ; Mon, 5 Jan 2026 19:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767642437; cv=none; b=kbBc1FmuRTwG95/pBB27nzQiz1c66I8mK5O8B3qD7IoFtqa9NG7bGaqajjE41SBq7uGgxME5iy8GooFxqF8uAw5TfBxY5WDf99ZzVBjSE4bx4WxwFwdFvKTkpCWnGThUfaC8PmFoghNQBMi88W+6+cK5hQ3dtAyEfM8fAL56ruI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767642437; c=relaxed/simple; bh=HAE1g7qj5qSEww/tQThpjbVLOOXjVAgBdMtDhylBNVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LqhAv7ucStfAsEZdO73M1mFTVRqT5U+JEmGB8rNOO50/46hX3fNn26kk80zFRb2Ed8N78JvUBtucOiEVYZ61zWoVx8Y5Uop1hmkp93S2HUI0v6wijy/R69iL5cmaFBxPgGk0V55GvaBIBjT45J09Y6ZY5FUe3QhA6yG5W5KFHSA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Uqgz4xS0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Uqgz4xS0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD65DC116D0; Mon, 5 Jan 2026 19:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767642437; bh=HAE1g7qj5qSEww/tQThpjbVLOOXjVAgBdMtDhylBNVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uqgz4xS0ZBajxXwPzKqlIkVlvfpaX8yskDBpJnE8L8mI1sONqCEb2KqTr5YYQ+U8I 0mqIVYaty96uU42vnMVLZ8BnZUglw6gMl581FC2lzKe18WtkY1tYLAQpFHIwAGcHOu NsWszJ93M09AfCY3aCD3W2RktbfQ1DXUeHWABNGUoKCmLjNWeMmMd6BhvluytFWE5j 4j7JLXvopQCGvcuHXThkpgRSH8oVP+VEUEU0pQX0y7NSS/B4n+nj7VQcVyhn+kyH8B iJ3FYxBI7RC5F0GiKUWES9NKTezLbTiOlbzVD2iM5es8pOJTiBjTved6/zlLfwOd6r +vw28afcOoNjA== From: Sasha Levin To: stable@vger.kernel.org Cc: Jim Quinlan , Bjorn Helgaas , Manivannan Sadhasivam , Florian Fainelli , Sasha Levin Subject: [PATCH 5.10.y] PCI: brcmstb: Fix disabling L0s capability Date: Mon, 5 Jan 2026 14:47:15 -0500 Message-ID: <20260105194715.2753386-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026010522-salami-progeny-1e6e@gregkh> References: <2026010522-salami-progeny-1e6e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jim Quinlan [ 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. Fixes: caab002d5069 ("PCI: brcmstb: Disable L0s component of ASPM if requested") Reported-by: Bjorn Helgaas Closes: https://lore.kernel.org/linux-pci/20250925194424.GA2197200@bhelgaas Signed-off-by: Jim Quinlan [mani: reworded subject and description, added closes tag and CCed stable] Signed-off-by: Manivannan Sadhasivam [bhelgaas: commit log] Signed-off-by: Bjorn Helgaas Reviewed-by: Florian Fainelli Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20251003170436.1446030-1-james.quinlan@broadcom.com [ Adjust context in variable declaration ] Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-brcmstb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 85be07e8b418..a5454b39672f 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -43,7 +43,6 @@ #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_ASPM_SUPPORT_MASK 0xc00 #define PCIE_RC_DL_MDIO_ADDR 0x1100 #define PCIE_RC_DL_MDIO_WR_DATA 0x1104 @@ -865,7 +864,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) int num_out_wins = 0; u16 nlw, cls, lnksta; int i, ret, memc; - u32 tmp, burst, aspm_support; + u32 tmp, burst; /* Reset the bridge */ pcie->bridge_sw_init_set(pcie, 1); @@ -987,12 +986,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); /* -- 2.51.0