From patchwork Fri Oct 27 14:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 158953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp640835vqb; Fri, 27 Oct 2023 07:22:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIcdpGkN0vNt8/U+pWQtmuNs/7qCvMz8a0EqVD+5EM7RTEjPn0i2XwT/d6sAIQbmoqX0aA X-Received: by 2002:a81:e608:0:b0:5a7:bc66:949f with SMTP id u8-20020a81e608000000b005a7bc66949fmr2695667ywl.26.1698416526006; Fri, 27 Oct 2023 07:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698416525; cv=none; d=google.com; s=arc-20160816; b=cxb9fWqUtwQ7zk37ulLZCwbFcNOLtRgzXzU8IhkIm+uqQmBXUeP9LiURVQahHCC0Yq mBZAbBtNgVcmc9CBooSVCfuJKRvVn2DWnmDCTHNc7oXtQYh0oDR36idY/dY4zN2RUt12 WG6dc7V8LHxiXK3DM8J2De0q6MSlcRm5V/C76HL+t56etTn2xrDe59Ok9p2OFd+W35k3 cZnXFWCHIGHNwwMDX/5N/pyyJu1nIyGOa3LEXzTnhSKtVyANg3ipFrFyvr8/75cEi0h1 sjKfkeT6k/kuI4Q5I24xf/d2hGpxVQIHtSto5DF9+/AUG9ZHCTDH6XXHshB4Km9Gi4UU k9yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=UvBWoApEQzNJmT0WsCerSguC4HxFjJesB2HE5zPn1Xg=; fh=4YRGpp4+erIE8EulKv6vTURWMTZkR1ZrVdHONvEW04M=; b=yhrS8bvPZfSY85B8S7LCkYKoa6HppBIuvwgehiC1un4XDMEqfVukBz6XyclEzV9cyA dyEm+wWQQ3vxS/u13o0G3QIosV5Vg2+9IhYVt/a5XoFxe2ecRGQmEhFjmS9kwgb8XYkp eVarBTbpRVMFphY68Nidmu1VtqoIndOjqc3C9J2/L05RvAumWoswEeYKlI5CRjGZzBhv NAAqfNh6ImHpwVf91XrVi5USpZqiOZTogI6dgtnVPfnhqxlNTBgvul+7IxaH/87vAQVO Rr/YsvE7CSyn8J/lS3zcG/xxQDKtx4kC/g67jMEJbPQG9kq6Iamq4SCwzPkl3mr9gUXU zQpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=z35HvEDh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s185-20020a8177c2000000b0059eb9ebb8d7si2534488ywc.383.2023.10.27.07.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=z35HvEDh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 69CCD80D31E1; Fri, 27 Oct 2023 07:21:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346185AbjJ0OU7 (ORCPT + 25 others); Fri, 27 Oct 2023 10:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346143AbjJ0OUn (ORCPT ); Fri, 27 Oct 2023 10:20:43 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47784D4A for ; Fri, 27 Oct 2023 07:20:35 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9becde9ea7bso688669466b.0 for ; Fri, 27 Oct 2023 07:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1698416434; x=1699021234; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=UvBWoApEQzNJmT0WsCerSguC4HxFjJesB2HE5zPn1Xg=; b=z35HvEDh6f9Uwdur6t80sDnGXW/0amvBymKr0ATLfKk9xobGL1Sme3h/9KG2t9c39R 0kyUo6UgOqpNJHRIS6oxVJKtAjveXV77RHKjiW9zpq6EJvI0wsPYiibMmq5+rhOfj0fi i+jM5aa/zGG8AHVLc2npR2mjiIN1LufvtkVkBRkrWKy5Dp3OtGOwXWTGLIS2XZkPaZlJ 8kkK7QoRMbh57KibDpcDf3CjMcoVluambIk34/dOqaAbiTcWN7uZwpCZK4wv9Uk9pcJZ H4lwnV8LoV0vU8Wc9f4rrBE972jQXHBdeUy/5jATMBf2v68qe55yNmhKQeCuuuQynOB+ GMxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698416434; x=1699021234; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UvBWoApEQzNJmT0WsCerSguC4HxFjJesB2HE5zPn1Xg=; b=Eo3sRRnAaah/t9mWc82jLOs02gRNN7VkhamR5mzlxjJCp4EwMHVfJLdTdSfKFo4t9g 6Vq67SyLtHCKyB4vDVNgFkVdlv1PFaH/T/ehcsDlGXnGvEh+B+jE1KxbIpXbzkstGfym y1kUzlfqwa13GQixHiqqwT24Eo6/Sm1vuOL//EWIKl11zqSYpGLg8VAChqMEfikJFKwg THW0lFE/b9JYpNXV1Zfdx/SpC2wRxsjbXJdP6htm0iW0VF8b+SnqDCTrXBwi+Qb5q4+L Xnp4OnE6hqFX/DNXOWfkBdGprt6EYZlFHxw1osqh5WDLorXSEbdt7rK237PuySu3g4Z/ v8kg== X-Gm-Message-State: AOJu0Yy5IGuygpTaKLC/wlzZGMbuyK+4MYUdFdB8sXrfCqtipCAbUg3M QGvUbiymSCjx2rI+Z22toHT39w== X-Received: by 2002:a17:907:8687:b0:9ad:e3fd:d46c with SMTP id qa7-20020a170907868700b009ade3fdd46cmr6206576ejc.10.1698416433790; Fri, 27 Oct 2023 07:20:33 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id z23-20020a170906075700b0099cc36c4681sm1254076ejb.157.2023.10.27.07.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:20:33 -0700 (PDT) From: Luca Weiss Date: Fri, 27 Oct 2023 16:20:27 +0200 Subject: [PATCH 5/9] arm64: dts: qcom: sc7280: Use WPSS PAS instead of PIL MIME-Version: 1.0 Message-Id: <20231027-sc7280-remoteprocs-v1-5-05ce95d9315a@fairphone.com> References: <20231027-sc7280-remoteprocs-v1-0-05ce95d9315a@fairphone.com> In-Reply-To: <20231027-sc7280-remoteprocs-v1-0-05ce95d9315a@fairphone.com> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , cros-qcom-dts-watchers@chromium.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Krzysztof Kozlowski , Rob Herring , =?utf-8?q?Matti_Lehtim=C3=A4ki?= , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 07:21:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780918807145884516 X-GMAIL-MSGID: 1780918807145884516 The wpss-pil driver wants to manage too many resources that cannot be touched with standard Qualcomm firmware. Use the compatible from the PAS driver and move the ChromeOS-specific bits to sc7280-chrome-common.dtsi. Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 19 ++++++++++++++++++- arch/arm64/boot/dts/qcom/sc7280.dtsi | 15 +++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index cd491e46666d..eb55616e0892 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -95,8 +95,25 @@ spi_flash: flash@0 { }; &remoteproc_wpss { - status = "okay"; + compatible = "qcom,sc7280-wpss-pil"; + clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>, + <&gcc GCC_WPSS_AHB_CLK>, + <&gcc GCC_WPSS_RSCP_CLK>, + <&rpmhcc RPMH_CXO_CLK>; + clock-names = "ahb_bdg", + "ahb", + "rscp", + "xo"; + + resets = <&aoss_reset AOSS_CC_WCSS_RESTART>, + <&pdc_reset PDC_WPSS_SYNC_RESET>; + reset-names = "restart", "pdc_sync"; + + qcom,halt-regs = <&tcsr_1 0x17000>; + firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt"; + + status = "okay"; }; &scm { diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 0d9cc44066ce..23bb6c41fca3 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3579,7 +3579,7 @@ qspi: spi@88dc000 { }; remoteproc_wpss: remoteproc@8a00000 { - compatible = "qcom,sc7280-wpss-pil"; + compatible = "qcom,sc7280-wpss-pas"; reg = <0 0x08a00000 0 0x10000>; interrupts-extended = <&intc GIC_SPI 587 IRQ_TYPE_EDGE_RISING>, @@ -3591,12 +3591,8 @@ remoteproc_wpss: remoteproc@8a00000 { interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack", "shutdown-ack"; - clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>, - <&gcc GCC_WPSS_AHB_CLK>, - <&gcc GCC_WPSS_RSCP_CLK>, - <&rpmhcc RPMH_CXO_CLK>; - clock-names = "ahb_bdg", "ahb", - "rscp", "xo"; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; power-domains = <&rpmhpd SC7280_CX>, <&rpmhpd SC7280_MX>; @@ -3609,11 +3605,6 @@ remoteproc_wpss: remoteproc@8a00000 { qcom,smem-states = <&wpss_smp2p_out 0>; qcom,smem-state-names = "stop"; - resets = <&aoss_reset AOSS_CC_WCSS_RESTART>, - <&pdc_reset PDC_WPSS_SYNC_RESET>; - reset-names = "restart", "pdc_sync"; - - qcom,halt-regs = <&tcsr_1 0x17000>; status = "disabled";