From patchwork Thu Oct 3 14:35:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 13821102 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E05851E515 for ; Thu, 3 Oct 2024 14:35:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727966141; cv=none; b=j/606OeFF+wtNce/QbpH0feaF2tNe5NAAnIlNozCDFTjGssQlKiWCZVeXuctpVuRfc0iYfJsKNl9DgEghC94jBllkbO4NQmw/8TjETwrkodmiL9UKtIq4tHYifJpIuPqzO2qiYd89VqttAWiv5Q1+zJFc0yKon7dbC1NVKPhrQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727966141; c=relaxed/simple; bh=N54dmoLlNOsGnEAWEfQXefuPa/xhRTadNIraizLCe1s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SSCkmisayIr6DjlpsNfjaJXBsWnmN4WWqB7LPfsIWdtF3a3nib1jav6eDlvJpCxyQ5lYQZq7f320AH2w3YEvC8Xmv3HInWRqGKpYj4fGYpeRY7CmO7NNoLs1c5Xf5dS+vjMdJGEIRNxaLy1BS3iiVK1XYb6q5OR9wFffODNk8kI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=x7zUtIKo; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="x7zUtIKo" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20b90ab6c19so11605025ad.0 for ; Thu, 03 Oct 2024 07:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727966139; x=1728570939; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FgHlujtmyhcjbOBlffOCoFSVo1C75JdKEXTiZOK2LMA=; b=x7zUtIKo77NGZ/Xd66/A6/X07rnomhrP2HGdNdQahM2s5afYER72ogu7H5+8B+WhUc PBkrGcbu2cHSoFAm39n+C6ONyAJlM6ir38xl3pyTb7qCmGB+c5t7eGjX4XRg5nQ0Jl8a Z2JkhdwMq7BMLV8PwvmAa7MP5DfYbLn07OEti6zMP+tgZnoVCZbmaJNWy5vtzvi9jbPx JsDvN6XXEQWHmTWOur71gnyq5erU6CSEtotK9Md18GXOtE4MJGSaxe4ACY7x/5f8K918 mCBV6QPYfwxDTrMRqOUDEnfo9zRhDZmLJmY2jDwJ3835mJQMFdi8vtaVa7lyJkmo4PeI AIeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727966139; x=1728570939; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FgHlujtmyhcjbOBlffOCoFSVo1C75JdKEXTiZOK2LMA=; b=vLzm6VesShaaB+rAeg6qXftg+tr4uXrgjOJelf2o1KPMq8rgeBbreT3eAUBeDrLQO7 9kfKXYz4YW1F9WiwLiwuFNVA3dlJ61GpyhaDrsIUyCDtkIjfWbEfeSaYcw5CjQ6c/Cjg t46gBpzdbbWFZ7aooefUpSEwEdD8Y5Fsn9zzUzjYUpGdMBx98vQh7fT++nbf/cWf2k2z G35SZElBhpTzqSUtlPqMF3JeETDsk6ZS8ZDn2+LlfD+Ta3Xv/PoUZgJwamClzt5Yx2WS qarp1S6065C7o13B2m3seK2W0iWwaLXiITergQyA4GcCo6+SvxKzq+/RUKxf6/9XFq5N jtSA== X-Forwarded-Encrypted: i=1; AJvYcCVvHoUDPp+9jpPPm6wdpdc7Dy8F0okpwRX3CgAQ60MeMGdXdIueM1bpYJzD36DuMeRDPZ1aJrgH54pf7nbB@vger.kernel.org X-Gm-Message-State: AOJu0Yypy4xCd95EWoijyHlMe4QsOo/O/gbVfSiaJccL+ZWMTOJDNbzW uBzAja8dwxnAw0wA1+vRMoOWw2fWJdXCft3IpkgbzSmsct1JxNSBTBLuIssSRA8= X-Google-Smtp-Source: AGHT+IGom3CsEqSiBenhxOnW/q1sX9QH2g5FjXp5jyzX90DjBX3NOeSBiOf9Phpuy+fg5BEjUvF0eg== X-Received: by 2002:a17:902:d488:b0:206:b399:2f21 with SMTP id d9443c01a7336-20bc5aaa63bmr103836265ad.43.1727966139000; Thu, 03 Oct 2024 07:35:39 -0700 (PDT) Received: from nagraj.domain.name ([2401:4900:1f28:5e7e:5e85:37d5:85c8:d4d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20bef7fd79dsm9534125ad.270.2024.10.03.07.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2024 07:35:38 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: dmitry.baryshkov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Sumit Semwal Subject: [PATCH] Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings" Date: Thu, 3 Oct 2024 20:05:32 +0530 Message-ID: <20241003143532.108444-1-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.46.2 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit cf9c7b34b90b622254b236a9a43737b6059a1c14. This commit breaks UFS on RB5 in the 6.1 LTS kernels. The original patch author suggests that this is not a stable kernel patch, hence reverting it. This was reported during testing with 6.1.103 / 5.15.165 LTS kernels merged in the respective Android Common Kernel branches. Signed-off-by: Sumit Semwal --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 6a2852584405..c9780b2afd2f 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2125,7 +2125,7 @@ ufs_mem_hc: ufshc@1d84000 { "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; interrupts = ; - phys = <&ufs_mem_phy>; + phys = <&ufs_mem_phy_lanes>; phy-names = "ufsphy"; lanes-per-direction = <2>; #reset-cells = <1>; @@ -2169,8 +2169,10 @@ ufs_mem_hc: ufshc@1d84000 { ufs_mem_phy: phy@1d87000 { compatible = "qcom,sm8250-qmp-ufs-phy"; - reg = <0 0x01d87000 0 0x1000>; - + reg = <0 0x01d87000 0 0x1c0>; + #address-cells = <2>; + #size-cells = <2>; + ranges; clock-names = "ref", "ref_aux"; clocks = <&rpmhcc RPMH_CXO_CLK>, @@ -2178,12 +2180,18 @@ ufs_mem_phy: phy@1d87000 { resets = <&ufs_mem_hc 0>; reset-names = "ufsphy"; + status = "disabled"; power-domains = <&gcc UFS_PHY_GDSC>; - #phy-cells = <0>; - - status = "disabled"; + ufs_mem_phy_lanes: phy@1d87400 { + reg = <0 0x01d87400 0 0x16c>, + <0 0x01d87600 0 0x200>, + <0 0x01d87c00 0 0x200>, + <0 0x01d87800 0 0x16c>, + <0 0x01d87a00 0 0x200>; + #phy-cells = <0>; + }; }; ipa_virt: interconnect@1e00000 {