From nobody Fri Apr 17 09:42:24 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90C48C433FE for ; Thu, 17 Nov 2022 10:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234830AbiKQKvh (ORCPT ); Thu, 17 Nov 2022 05:51:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233502AbiKQKvd (ORCPT ); Thu, 17 Nov 2022 05:51:33 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 028CF183B5 for ; Thu, 17 Nov 2022 02:50:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668682230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x6n9un+DF1STb0f8Wt45FFfORAUWPZZjfWdP+jBOFAw=; b=IGz8/5Yx70KGnfHXmFSM3h2LAPA9ScSjg9V6BfDkK2CDmGiPRmEb4BDfAAgwehcLYmdil9 VkyJ9Tgil6ARowkDEddwAxTk8CpM67+1sHa9QldpgPue11TAiIlHw6lARG+yY0C/1iuNXI ku4oY1VC/ok8KrhjHZNg1HOCsLSUPP4= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-126-n7e_mWaINmyK4_nliwCNWQ-1; Thu, 17 Nov 2022 05:50:28 -0500 X-MC-Unique: n7e_mWaINmyK4_nliwCNWQ-1 Received: by mail-qt1-f200.google.com with SMTP id ff5-20020a05622a4d8500b003a526107477so1297427qtb.9 for ; Thu, 17 Nov 2022 02:50:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x6n9un+DF1STb0f8Wt45FFfORAUWPZZjfWdP+jBOFAw=; b=3nnTUhFHHkhPR8K3GP7j66KKbya1G1eTPnjK8YR8Kteh+709+skWuG6lIc11Wb8DXA rtVRSO9Tpdp+GEio6SfMSwloL4PM9H1w4W3acqrz8LWpsrBWhhk+WKhJQEz2zbqTMBr7 3pUh4y/sJUrtH/++Q+PyFgmdDFev4odlGUnU/Apst6nGbm5VT4YDkbCFe9Q3hhrocnQ4 b+OsFzN2w0rrAPmP7LJJg1+5YLn42as5bK3X/mxH3xFyQhSY9/O7QfF2hhhmA7HQj8fp AIbGW3shCjbK5uL4+S8bqj1m6s5GFDcxuayxB31zPUYrZEeaZxzuaiDFsUlepXq3cM/P Jktg== X-Gm-Message-State: ANoB5pmhfIu+l5awG3W5W3vLcJrOlx18mT7JzcN0D9MMX1yxTZcVSeE4 +yXC5uyOpFRoOEJEP+p0bzKr0N6oB1ZJKJK6u0GwNG1yMc5HYNynVrMjT1D7ysvYEGvGT16cYNU Qs85QetFWybcnCI6vmrqiiE3M X-Received: by 2002:ac8:741a:0:b0:3a5:2932:3a77 with SMTP id p26-20020ac8741a000000b003a529323a77mr1561853qtq.591.1668682228224; Thu, 17 Nov 2022 02:50:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7q5r/FX9thYRsL+y5bwss1yFZk9BsIvNayz/qC38oOghK204AtAl8ETLODAyxsuBJu8fXOWQ== X-Received: by 2002:ac8:741a:0:b0:3a5:2932:3a77 with SMTP id p26-20020ac8741a000000b003a529323a77mr1561843qtq.591.1668682228025; Thu, 17 Nov 2022 02:50:28 -0800 (PST) Received: from x1.redhat.com (c-73-214-169-22.hsd1.pa.comcast.net. [73.214.169.22]) by smtp.gmail.com with ESMTPSA id i15-20020a05620a248f00b006fa9d101775sm236022qkn.33.2022.11.17.02.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 02:50:27 -0800 (PST) From: Brian Masney To: andersson@kernel.org Cc: agross@kernel.org, konrad.dybcio@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, jejb@linux.ibm.com, martin.petersen@oracle.com, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 1/2] scsi: ufs: ufs-qcom: add basic interconnect support Date: Thu, 17 Nov 2022 05:49:56 -0500 Message-Id: <20221117104957.254648-2-bmasney@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117104957.254648-1-bmasney@redhat.com> References: <20221117104957.254648-1-bmasney@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The firmware on the Qualcomm platforms expects the interconnect votes to be present. Let's add very basic support where the maximum throughput is requested to match what's done in a few other drivers. This will not break boot on systems where the interconnects and interconnect-names properties are not specified in device tree for UFS since the interconnect framework will silently return. Signed-off-by: Brian Masney --- drivers/ufs/host/ufs-qcom.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 8ad1415e10b6..55bf8dd88985 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -936,6 +937,22 @@ static const struct reset_control_ops ufs_qcom_reset_o= ps =3D { .deassert =3D ufs_qcom_reset_deassert, }; =20 +static int ufs_qcom_icc_init(struct device *dev, char *pathname) +{ + struct icc_path *path; + int ret; + + path =3D devm_of_icc_get(dev, pathname); + if (IS_ERR(path)) + return dev_err_probe(dev, PTR_ERR(path), "failed to acquire interconnect= path\n"); + + ret =3D icc_set_bw(path, 0, UINT_MAX); + if (ret < 0) + return dev_err_probe(dev, ret, "failed to set bandwidth request\n"); + + return 0; +} + /** * ufs_qcom_init - bind phy with controller * @hba: host controller instance @@ -991,6 +1008,14 @@ static int ufs_qcom_init(struct ufs_hba *hba) err =3D dev_err_probe(dev, PTR_ERR(host->generic_phy), "Failed to get P= HY\n"); goto out_variant_clear; } + + err =3D ufs_qcom_icc_init(dev, "ufs-ddr"); + if (err) + goto out_variant_clear; + + err =3D ufs_qcom_icc_init(dev, "cpu-ufs"); + if (err) + goto out_variant_clear; } =20 host->device_reset =3D devm_gpiod_get_optional(dev, "reset", --=20 2.38.1 From nobody Fri Apr 17 09:42:24 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 748B5C433FE for ; Thu, 17 Nov 2022 10:52:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234696AbiKQKwf (ORCPT ); Thu, 17 Nov 2022 05:52:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239434AbiKQKwY (ORCPT ); Thu, 17 Nov 2022 05:52:24 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EE3715FCC for ; Thu, 17 Nov 2022 02:50:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668682231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gjXLVyb6zwFPJe/OWlCp49ZVjP/sJNSDFeUY35Ol3A8=; b=W6q/bekgWbQSZm44C3hxfB2kt2AUHmuMcmOXoSSFzC2B5nbXPVlzQVmMSQYIJ+gX3O6+bL R/FLtYkf6FqHS9l3QpGYHHYiDdAahW1uHpwHjhTl1CwoqXdrjEdqUI5iQY9P+C2LypVg7/ pCx7EFofAHyrq71FVD34Sinj4LZPFkM= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-662-50snJrewNmGoXzu9R6jxaQ-1; Thu, 17 Nov 2022 05:50:30 -0500 X-MC-Unique: 50snJrewNmGoXzu9R6jxaQ-1 Received: by mail-qk1-f198.google.com with SMTP id w4-20020a05620a444400b006fa24b2f394so1634097qkp.15 for ; Thu, 17 Nov 2022 02:50:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gjXLVyb6zwFPJe/OWlCp49ZVjP/sJNSDFeUY35Ol3A8=; b=l9bfR6hdDFrBYjv9u6T4sjV4wfNdrw/iMCNb0LWo/92EansSe/6nZOlkvH5rKeqyq0 L7+iSEtm3ea0pppDjj2pgfw3/dYBXwHt6D7PsRoY4pwjprkLmvpma1RiFgefGYFb75Xu NUjPHCXXnj2w88aiMBrQpIUhJ9LAikdIviGhgf/kj43+GnFMsiDKHES1CYSgo+i5UNaW URh+MKz0orWKEaN6mZ41Z25L6UgaZMjehZ9SAhjd7e1Q87Dr6xoJINfwrGANLaIozckI e8XXzLiHOBqmWvZ7wxI5CgrmT1S2rYFYDO3EltrHiU7nQY93ffKBkC7ZP79ovQMtMwOg 74qw== X-Gm-Message-State: ANoB5pm8ZitvCWPaQhlgJZJ6WUQsOExG+AhLIkuVlZ/Wcb9//V9ONVQp mchwIzVSOIC2bGuZfWKUjPskH1NSFea5O7/CHcLgNqnncKuMb7Ctbu6JnYLOBIt4+4IrKgRP9VH XVk7lqM+mgvnmCN+XJfe+JKP/ X-Received: by 2002:a37:5fc2:0:b0:6fa:9812:42f2 with SMTP id t185-20020a375fc2000000b006fa981242f2mr1057168qkb.754.1668682229904; Thu, 17 Nov 2022 02:50:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RXZjMGaetDJxgafbFUWe5YQR5qu294zU1xPcswkZUjgobAH+kXp2W1odUKDMEVqvGYKrhTw== X-Received: by 2002:a37:5fc2:0:b0:6fa:9812:42f2 with SMTP id t185-20020a375fc2000000b006fa981242f2mr1057156qkb.754.1668682229703; Thu, 17 Nov 2022 02:50:29 -0800 (PST) Received: from x1.redhat.com (c-73-214-169-22.hsd1.pa.comcast.net. [73.214.169.22]) by smtp.gmail.com with ESMTPSA id i15-20020a05620a248f00b006fa9d101775sm236022qkn.33.2022.11.17.02.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 02:50:29 -0800 (PST) From: Brian Masney To: andersson@kernel.org Cc: agross@kernel.org, konrad.dybcio@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, jejb@linux.ibm.com, martin.petersen@oracle.com, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: sc8280xp: add interconnect properties to ufs nodes Date: Thu, 17 Nov 2022 05:49:57 -0500 Message-Id: <20221117104957.254648-3-bmasney@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221117104957.254648-1-bmasney@redhat.com> References: <20221117104957.254648-1-bmasney@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add the missing interconnects and interconnect-names properties to the ufs_mem_hc and ufs_card_hc nodes. Signed-off-by: Brian Masney --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index 6bc12e507d21..17c8dc8d4767 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -856,6 +856,10 @@ ufs_mem_hc: ufs@1d84000 { =20 iommus =3D <&apps_smmu 0xe0 0x0>; =20 + interconnects =3D <&aggre1_noc MASTER_UFS_MEM 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_UFS_MEM= _CFG 0>; + interconnect-names =3D "ufs-ddr", "cpu-ufs"; + clocks =3D <&gcc GCC_UFS_PHY_AXI_CLK>, <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>, <&gcc GCC_UFS_PHY_AHB_CLK>, @@ -924,6 +928,10 @@ ufs_card_hc: ufs@1da4000 { =20 iommus =3D <&apps_smmu 0x4a0 0x0>; =20 + interconnects =3D <&aggre2_noc MASTER_UFS_CARD 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_UFS_CAR= D_CFG 0>; + interconnect-names =3D "ufs-ddr", "cpu-ufs"; + clocks =3D <&gcc GCC_UFS_CARD_AXI_CLK>, <&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>, <&gcc GCC_UFS_CARD_AHB_CLK>, --=20 2.38.1