From mboxrd@z Thu Jan 1 00:00:00 1970 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 8CABC3DB86 for ; Mon, 22 Jan 2024 20:15:42 +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=1705954542; cv=none; b=jQlOT7LY2K/3A7WfuN2sZNiHbvKxl+SGEAIihIBS8u7DnoTEsUq06yal9SRWGHhoWBE4vqmoe/cwzj3cIPo7hERjja3kY7zSodYuBybtaKVyZgHdiWY9KE01UEd9MjTng/pX9hLE068r5FOqU8hBAmTemJrQDjqpTiCNiwXU44c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705954542; c=relaxed/simple; bh=Jz30tTp1oa/1r07va0eSNZu31xZ9q54ZHwDtkzyYbgE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=AqMv7WTafxghiRf4CBUfZsXQTnllPRx//Z19fl8aw+7EfcQa1d0rwcy/ATNLdU04s1SKTEJPslhv06PvKDTh1WCc4JQsINauXKaMCmO3gjBtDVVL1Ch12XXdFTlcpLAuE/LxqWygynXswQbQ6GrNNj+IR1iC72sM5Z0NPC6OMrI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yfNG5bAP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yfNG5bAP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC63EC43390; Mon, 22 Jan 2024 20:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705954542; bh=Jz30tTp1oa/1r07va0eSNZu31xZ9q54ZHwDtkzyYbgE=; h=Subject:To:Cc:From:Date:From; b=yfNG5bAPez6xAU1J7FkQFVITBClCo+gOPFHoXQ0N/sk8/7EoffDWB1CkCLWisZ03b fhdfiMk/4MgK2YaJY349HW5jfrJpZVQ/lamQvAjQk+QPuyI65yCIPo2D36+PS4pHxU pvW/sZ+yWPk2izlfdAXYkWgmWFs+FqXLH7OIg5W0= Subject: FAILED: patch "[PATCH] ARM: dts: qcom: sdx55: Fix the base address of PCIe PHY" failed to apply to 6.6-stable tree To: manivannan.sadhasivam@linaro.org,andersson@kernel.org,dmitry.baryshkov@linaro.org,konrad.dybcio@linaro.org Cc: From: Date: Mon, 22 Jan 2024 12:15:39 -0800 Message-ID: <2024012239-monstrous-fridge-7c31@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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 . 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.6.y git checkout FETCH_HEAD git cherry-pick -x cc6fc55c7ae04ab19b3972f78d3a8b1be32bf533 # git commit -s git send-email --to '' --in-reply-to '2024012239-monstrous-fridge-7c31@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: cc6fc55c7ae0 ("ARM: dts: qcom: sdx55: Fix the base address of PCIe PHY") bb56cff4ac03 ("ARM: dts: qcom-sdx55: switch PCIe QMP PHY to new style of bindings") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cc6fc55c7ae04ab19b3972f78d3a8b1be32bf533 Mon Sep 17 00:00:00 2001 From: Manivannan Sadhasivam Date: Mon, 11 Dec 2023 22:54:11 +0530 Subject: [PATCH] ARM: dts: qcom: sdx55: Fix the base address of PCIe PHY While convering the binding to new format, serdes address specified in the old binding was used as the base address. This causes a boot hang as the driver tries to access memory region outside of the specified address. Fix it! Cc: Dmitry Baryshkov Cc: stable@vger.kernel.org # 6.6 Fixes: bb56cff4ac03 ("ARM: dts: qcom-sdx55: switch PCIe QMP PHY to new style of bindings") Signed-off-by: Manivannan Sadhasivam Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20231211172411.141289-1-manivannan.sadhasivam@linaro.org Signed-off-by: Bjorn Andersson diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi index e233233c74ce..2045fc779f88 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi @@ -431,9 +431,9 @@ pcie_ep: pcie-ep@1c00000 { status = "disabled"; }; - pcie_phy: phy@1c07000 { + pcie_phy: phy@1c06000 { compatible = "qcom,sdx55-qmp-pcie-phy"; - reg = <0x01c07000 0x2000>; + reg = <0x01c06000 0x2000>; #address-cells = <1>; #size-cells = <1>; ranges;