From patchwork Wed Apr 17 20:06:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13633825 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33597C04FFE for ; Wed, 17 Apr 2024 20:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5KpUtq3iZ7o8nrOAZnW7jCfRCaT2jJ70oWP28tCBAwE=; b=mNBFGdqGc3o3iQ ZBHbLW26Ga/EUT8PDdNfJh/AXVDgq0zXEqaq+X2YggAjo8sAcNpcZ8hqoMr/1RfrPf6gMtV22uVbO uP3tyKVTfIXdOtOhJYjU+424rMNkp2PsKa7wDsboYtI2Qr0DP8/JGq+JKmM/i6FSdCX7cXjgxi8VY 7PXx9er1Xf9xuqivGYq9OM/x2RsMitzjRe7Yr1QLKjKN8Fyad64qJgbkayfQKunE4IlApl6QgqaSe gPhsrK2dYm/JSjrxeWNis73si5kv8T0NkVVFdm1wS9x8nVsXaJ+UNsCcCgFT26yTwR72fHgV23Oyp XcHasKJmH/hpmvjeRgWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxBYq-0000000HSxo-1QLm; Wed, 17 Apr 2024 20:07:16 +0000 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxBYi-0000000HStc-1C1d for linux-arm-kernel@lists.infradead.org; Wed, 17 Apr 2024 20:07:09 +0000 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-518a56cdbcfso78157e87.2 for ; Wed, 17 Apr 2024 13:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713384425; x=1713989225; darn=lists.infradead.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=D/wLorb8s/wxRn0nx2P3JnCqrMElCXyUmbwHbfSHp1A=; b=CoHNqI6kQ4YTaOXRXxfRPXyA+MYlW35CO4D1Xeiwqdd1lLS24lvDNQVLO2ozVA3R0B QecOfiQ+LQJLOAKn+ATOOmDNsHbdNyy/2cpFnCuJndMi7yRHvOJghaTrZv4SLQdUrgLg lQYoNjnpAyC3wnz0Ij94XMspBON6sShxbxR2MHjGjaSZHJg6bbuPg4ek6M01A8US+Gw3 jaj/5ElMIv9aQvCipOgWRrKzaSQEtQestha7Uo5bqzaOAkhOablTN2VtvwrZ871+RnmU QZqx0nDgk/bOVcSKilZZfp+bUIIIBjtXnZMJ3sEJIwFaIS5EWO35tYSST7VFYp331dT3 D8IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713384425; x=1713989225; 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=D/wLorb8s/wxRn0nx2P3JnCqrMElCXyUmbwHbfSHp1A=; b=nP9C//VjFxMGTb/N0Kzdp6KWtn2T3IGJQYTLaZRlmCqBKkpsefMWZZxvCGkAksaJNz CUCdkmqjFtgJgYySDOaMF8BsN/me30tYwClNVquPzDg4y/vI/roteW+RwxSXGrhVvvL8 1JSPIMx3SNBpZu7nohsjTYgWRtXDoYXnI2AjkDPO9j72/vx3hL4AP/Llo5GRh+003cCd ENZY4uZwYgw5kw5px3n1py1ADK6Br20Rfg+Utp6NfTf3ZVZv+6xNajVCMDaPfjvR1Pxp BhKsdY3FRJjnvf4w4w54PAZpcQJ7fUgC6KYFYHFXj1rD5c/6IqjsyHV47FbUbHLWfNoH H2yQ== X-Forwarded-Encrypted: i=1; AJvYcCXwVqgKJimarZZWeDL85I5vMXAOLuI+BRJD/m7582UWI+UwPT6CTXSeZro/vj9dTeifi7Asek+m6xJAF3iplsxPjirLzhWUA9mPP1MvUbERcR/4Lo0= X-Gm-Message-State: AOJu0YyVxEMZkK+VfXJk31VExI+Y8P9tlSI96wPz4Mf7j84OYat+RKHY +TXotHbU/dAHRi3Rf96I82+tTePIM6GM2EG4KPfWBc5GoMKr8+bVWtiJKzwOQyFwtjTg6oLkU57 G X-Google-Smtp-Source: AGHT+IFhc+YiEEchmcEnwplLOB4LzpFRorv1csY8s/d98HoFZzUavjGEBrTgxsRrSSINY1ECFOPWKQ== X-Received: by 2002:a19:770b:0:b0:518:9ce1:a5bb with SMTP id s11-20020a19770b000000b005189ce1a5bbmr221524lfc.54.1713384425537; Wed, 17 Apr 2024 13:07:05 -0700 (PDT) Received: from [192.168.45.55] (078088045141.garwolin.vectranet.pl. [78.88.45.141]) by smtp.gmail.com with ESMTPSA id l1-20020a17090615c100b00a524e3f2f9esm6128057ejd.98.2024.04.17.13.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 13:07:04 -0700 (PDT) From: Konrad Dybcio Date: Wed, 17 Apr 2024 22:06:59 +0200 Subject: [PATCH 1/2] iommu/qcom: Remove useless forward definition MIME-Version: 1.0 Message-Id: <20240416-topic-qcom_iommu-v1-1-fabe55b3b7b3@linaro.org> References: <20240416-topic-qcom_iommu-v1-0-fabe55b3b7b3@linaro.org> In-Reply-To: <20240416-topic-qcom_iommu-v1-0-fabe55b3b7b3@linaro.org> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephan Gerhold , Marijn Suijten , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1713384421; l=1236; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=K0ao8Vo7sPBfbnwTda3s2I9W96Cl7inckQMbp1qX6wI=; b=6cYUGa8Goag8a2aUNA1eqwMKeX2FK4TOEyCqJmO8C5udyr+6wz+22OMrZWc39n6z6JZ4MLaC1 WxHuDRgmVY8DzAUtW9uZqmUkiiUQkzrtSPCIaYsmHLZi8HP7Tni0oxk X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240417_130708_381650_D628B202 X-CRM114-Status: GOOD ( 10.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Simply move code around. Signed-off-by: Konrad Dybcio Reviewed-by: Bjorn Andersson --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index e079bb7a993e..3dca9293c509 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -41,7 +41,14 @@ enum qcom_iommu_clk { CLK_NUM, }; -struct qcom_iommu_ctx; +struct qcom_iommu_ctx { + struct device *dev; + void __iomem *base; + bool secure_init; + bool secured_ctx; + u8 asid; /* asid and ctx bank # are 1:1 */ + struct iommu_domain *domain; +}; struct qcom_iommu_dev { /* IOMMU core code handle */ @@ -54,15 +61,6 @@ struct qcom_iommu_dev { struct qcom_iommu_ctx *ctxs[]; /* indexed by asid */ }; -struct qcom_iommu_ctx { - struct device *dev; - void __iomem *base; - bool secure_init; - bool secured_ctx; - u8 asid; /* asid and ctx bank # are 1:1 */ - struct iommu_domain *domain; -}; - struct qcom_iommu_domain { struct io_pgtable_ops *pgtbl_ops; spinlock_t pgtbl_lock; From patchwork Wed Apr 17 20:07:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13633824 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9348C4345F for ; Wed, 17 Apr 2024 20:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=826kP+Ng/AIsdAnP8FTe2XMtgHjAPrlgqcf0BZ5Vs1Y=; b=xoTHINC4+4cpKH fy7wB+N423mke6skEChxXG1ub183YzYosC6t6Cl1wyp3zE9hVZ4NcLsV19DeTaCkKudQOeM5kYF9Z XSnbJLUg5SN5IehvheyQzZg6YSkQLBi/02VPQ1wiL33qznaLd5fLa7NsZqNYALfNMSs9FT8vlK1nb ie0RN44MFVrlc64xKv+3UWx9v4ed7YFWATaiXcDVikK71J/ge5hkOSVFcbhQsVEdXZ+dARcOdeqT+ /0mY9Go88gpgmKc5FrcEQrYRJwuZXsh9sqBurI8yb8GqJg2cD1unpc4Mcgjh4ajTKgUDtvKv3+24/ a5E0sZp5DN3y1Hscp22A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxBYr-0000000HSyR-0VIb; Wed, 17 Apr 2024 20:07:17 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxBYl-0000000HSus-2tJe for linux-arm-kernel@lists.infradead.org; Wed, 17 Apr 2024 20:07:13 +0000 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a526d381d2fso220130466b.0 for ; Wed, 17 Apr 2024 13:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713384428; x=1713989228; darn=lists.infradead.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=t9Kjw76bMPVOsbjzjb0d38GfEfCd3+VQVKqEmN50hoY=; b=n5nmMUyjUFsqlCdujxh4aiawL/QgS9lHLooaKOMZHdmZ+qQ5AgRv6Km8hMu1AUCKic JcQtshxjeK4FQ1NKVysprcIzZFl4OWV04OWtMQXRkeSko2mIiD7acu/ygqWsDc8HmZws RfYYd7o5jY3Pevs6prmaYPzqn3LjU0Vhzqt0TEFEnusht9oqkqK00FjbSZ6wa4UdaoO9 DXrbe/oE4wHBqvxvVrXaEME6eWXoLBLtGREyKHL0Aq3UB48S7Gt3/3vybtV7bONjsKmi v59UwgSGPyP5oH13T7n6EE9QxX9CmUin3jK1Q7haM7QrkBV8D7gXDg/gClIUs1K+Mcjr TvcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713384428; x=1713989228; 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=t9Kjw76bMPVOsbjzjb0d38GfEfCd3+VQVKqEmN50hoY=; b=Q+z4P2OeZ51b1KjXrn3OTF8yVajPDuk+ifJIrzJzECoQOLVmGemFVGBvc0P0RVR1hR bzOR3VstBujT0+2W95I+qu63B38tCA/Lh9nznrhuFwGVa4VcnzaxeGnIlm+n1H9c/Mq4 cSjNLzxSCe4a3TpCCziAeBLhK9KYcBsukZNynAOI0CKbahd1CyEUSk2n9lmxfkCuxuEj ioB14b8oqjNULXc4Nj8ZsugGp/QAnLL2ljNP0z70OVazXDhcoaJXsIbQkyBx5sHvIHcf 9d7bR5pOLWwQCBiFq8z1DhDs9zV0vybd349/asrpPNdm9zU9QMgKLXLC7XfgWO5U7UBG 9Imw== X-Forwarded-Encrypted: i=1; AJvYcCUcpxO5M8Lb+vCC2Clu2FJRSDk+FqibvWwhaBwCHUKMQOJmJPuN4z7X8HpC/htTz0422Fvqawwi5jGkcyTQ8d8NW4uvjfvVd0EaXIpg6sp0OdQkPgA= X-Gm-Message-State: AOJu0YyPftQm88j2DMImNWFGyQoCxkIz4oSxsIghf5Fh/XgvdkbMQGcH fwTqaI0PFfNt66jemOtsxazkctcbboBuWCD93Ku1rL/R1aHVN+Un/AZS3JQXhQmeOJedvqxTmwg m X-Google-Smtp-Source: AGHT+IF6lNe7FJxy2kYSpHWMMUEGZhhuFhiDyuheXUBZhHBVpx+1Ckk0HCLalQKp09AtJ/CUpiDCaw== X-Received: by 2002:a17:906:c812:b0:a52:a25:2077 with SMTP id cx18-20020a170906c81200b00a520a252077mr148120ejb.14.1713384427698; Wed, 17 Apr 2024 13:07:07 -0700 (PDT) Received: from [192.168.45.55] (078088045141.garwolin.vectranet.pl. [78.88.45.141]) by smtp.gmail.com with ESMTPSA id l1-20020a17090615c100b00a524e3f2f9esm6128057ejd.98.2024.04.17.13.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 13:07:06 -0700 (PDT) From: Konrad Dybcio Date: Wed, 17 Apr 2024 22:07:00 +0200 Subject: [PATCH 2/2] iommu/qcom: Always consume all clocks MIME-Version: 1.0 Message-Id: <20240416-topic-qcom_iommu-v1-2-fabe55b3b7b3@linaro.org> References: <20240416-topic-qcom_iommu-v1-0-fabe55b3b7b3@linaro.org> In-Reply-To: <20240416-topic-qcom_iommu-v1-0-fabe55b3b7b3@linaro.org> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephan Gerhold , Marijn Suijten , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1713384421; l=3042; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=3mbMg2ivwWNTK3xsS4wYTiDYZ0KlaU3IbtBCWSlfYEw=; b=vMKT1TBfwDN6a7yS7Xa9gR7+R8/09NZEgAT7cVeFCam7yhXFkvI+O3+YWOJ91TNYJjTsArd92 T3eW7mR8qIWCZp6oPYrDTvlNFLA5FPFMjMh/2H2oX1NZ647vny1akj5 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240417_130711_783895_7890DA07 X-CRM114-Status: GOOD ( 15.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some platforms provide more clocks than others, we already have the DT schema to ensure sanity here plus these clocks simply need to be on. Use devm_clk_bulk_get_all and get rid of some boilerplate. Signed-off-by: Konrad Dybcio Reviewed-by: Bjorn Andersson --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 38 +++++++-------------------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index 3dca9293c509..ace69030a422 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -34,13 +34,6 @@ #define SMMU_INTR_SEL_NS 0x2000 -enum qcom_iommu_clk { - CLK_IFACE, - CLK_BUS, - CLK_TBU, - CLK_NUM, -}; - struct qcom_iommu_ctx { struct device *dev; void __iomem *base; @@ -54,7 +47,8 @@ struct qcom_iommu_dev { /* IOMMU core code handle */ struct iommu_device iommu; struct device *dev; - struct clk_bulk_data clks[CLK_NUM]; + struct clk_bulk_data *clks; + int num_clks; void __iomem *local_base; u32 sec_id; u8 max_asid; @@ -781,7 +775,6 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) struct qcom_iommu_dev *qcom_iommu; struct device *dev = &pdev->dev; struct resource *res; - struct clk *clk; int ret, max_asid = 0; /* find the max asid (which is 1:1 to ctx bank idx), so we know how @@ -804,26 +797,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) return PTR_ERR(qcom_iommu->local_base); } - clk = devm_clk_get(dev, "iface"); - if (IS_ERR(clk)) { - dev_err(dev, "failed to get iface clock\n"); - return PTR_ERR(clk); - } - qcom_iommu->clks[CLK_IFACE].clk = clk; - - clk = devm_clk_get(dev, "bus"); - if (IS_ERR(clk)) { - dev_err(dev, "failed to get bus clock\n"); - return PTR_ERR(clk); - } - qcom_iommu->clks[CLK_BUS].clk = clk; + ret = devm_clk_bulk_get_all(dev, &qcom_iommu->clks); + if (ret <= 0) + return dev_err_probe(dev, ret, "Couldn't get clocks\n"); - clk = devm_clk_get_optional(dev, "tbu"); - if (IS_ERR(clk)) { - dev_err(dev, "failed to get tbu clock\n"); - return PTR_ERR(clk); - } - qcom_iommu->clks[CLK_TBU].clk = clk; + qcom_iommu->num_clks = ret; if (of_property_read_u32(dev->of_node, "qcom,iommu-secure-id", &qcom_iommu->sec_id)) { @@ -891,7 +869,7 @@ static int __maybe_unused qcom_iommu_resume(struct device *dev) struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev); int ret; - ret = clk_bulk_prepare_enable(CLK_NUM, qcom_iommu->clks); + ret = clk_bulk_prepare_enable(qcom_iommu->num_clks, qcom_iommu->clks); if (ret < 0) return ret; @@ -905,7 +883,7 @@ static int __maybe_unused qcom_iommu_suspend(struct device *dev) { struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev); - clk_bulk_disable_unprepare(CLK_NUM, qcom_iommu->clks); + clk_bulk_disable_unprepare(qcom_iommu->num_clks, qcom_iommu->clks); return 0; }