From patchwork Fri Feb 17 11:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 654790 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 164A3C05027 for ; Fri, 17 Feb 2023 11:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229980AbjBQLQp (ORCPT ); Fri, 17 Feb 2023 06:16:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbjBQLQh (ORCPT ); Fri, 17 Feb 2023 06:16:37 -0500 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 991FD6537B for ; Fri, 17 Feb 2023 03:16:22 -0800 (PST) Received: by mail-lj1-x22d.google.com with SMTP id r28so817693ljk.1 for ; Fri, 17 Feb 2023 03:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+0wgn2J7sEsdXuKmA4KpznfU8V8XceUpwL6C1j73+Vk=; b=RAvARnqIsPMy9f5GaK1MNvreQnSXl+M+pThsIcYiN1Q9g2t6VHJrVFo2U4+M0uOJ5Z /KpjrpL+RAWFVVykX5XuvRbaB5OjhOnMJt15UEeAPh1ps25cs9UJzU0dU3dPUU1NHVAA PacZGS9yXbcmZEJ+6/pgV6SmHPZWcz5VvuUZclo33OAZshSidIuzmtsRqtZjHRZIbtFX bOlQu6paNxXzYEjiJ48huFwvJzkdGVy1iZLTWlHhZ8OGKp7fUm2M2j9M8r3RL45+hK9g 0UVkMrk68o1tqkIGy/db0388OPitMpo9JP43Hamoszy5PmRWkrqkjdNCm9HoHWVVv52h n5tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=+0wgn2J7sEsdXuKmA4KpznfU8V8XceUpwL6C1j73+Vk=; b=l5wBgPfgNd7Qit9AWLIgnEnTsYm6VKPjT50yV37nO39pPAcE+MuGP1EEru4dAerTfV /I+dho0DbN1JyhOSvU3q2l+XFeM+V1t+DdS+p2KQ9PgbAPa57KT0sLT2Gd/zW6IPRRdr r4ReJ2PZaKbzvKAhUPAEIz5pLHlwBk3P3WcXhGAFf5uCuG/SCqD0jph8xqeTy8IYoKrW LZ8fCbABp4zb5IU3eVuvVI7uuFZ3CGoe+JM+V2KCtLBVypHeN1bNmLm3q0Y0G2buvF6l dlOzRFQIPUnwiugHGf+YyRhoqYyqjNOzDqo5h3j+BibEBEVLrA6sCqJultD4UpW4eof2 0CrQ== X-Gm-Message-State: AO0yUKUI9gbBxL2uovEeJIeA2Sde5KNhj1hw5qDhnp7UqsaNTc6HSwVi iy/BeL0kzN3pDJnSO4v8VuuMD6+QL2sdWAcG X-Google-Smtp-Source: AK7set9lo1Ogld4ROanEoCe4HM6RFQDGXicVXFMKolFlMlzkWDQ8Q5+BY8esgFULFr2j4/EeaRuM5A== X-Received: by 2002:a05:651c:512:b0:28b:6d76:e9ce with SMTP id o18-20020a05651c051200b0028b6d76e9cemr198780ljp.23.1676632580456; Fri, 17 Feb 2023 03:16:20 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id u21-20020a2e9b15000000b002935899fe3fsm554818lji.116.2023.02.17.03.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 03:16:19 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] dt-bindings: arm-smmu: Use qcom,smmu compatible for MMU500 adreno SMMUs Date: Fri, 17 Feb 2023 12:16:08 +0100 Message-Id: <20230217111613.306978-1-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org qcom,smmu-500 was introduced to prevent people from adding new compatibles for what seems to roughly be the same hardware. Use it for qcom,adreno-smmu-compatible targets as well. Signed-off-by: Konrad Dybcio Acked-by: Krzysztof Kozlowski --- v1 -> v2: - Add this patch, omitted previously (big oops) .../devicetree/bindings/iommu/arm,smmu.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 807cb511fe18..4d7f61700cae 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -75,9 +75,19 @@ properties: - qcom,sm8350-smmu-500 - qcom,sm8450-smmu-500 - const: arm,mmu-500 - - - description: Qcom Adreno GPUs implementing "arm,smmu-500" + - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,smmu-500" + items: + - enum: + - qcom,sc7280-smmu-500 + - qcom,sm8150-smmu-500 + - qcom,sm8250-smmu-500 + - const: qcom,adreno-smmu + - const: qcom,smmu-500 + - const: arm,mmu-500 + - description: Qcom Adreno GPUs implementing "arm,smmu-500" (legacy binding) + deprecated: true items: + # Do not add additional SoC to this list. Instead use previous list. - enum: - qcom,sc7280-smmu-500 - qcom,sm8150-smmu-500 From patchwork Fri Feb 17 11:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 654789 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 2E9E3C636D4 for ; Fri, 17 Feb 2023 11:16:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230046AbjBQLQv (ORCPT ); Fri, 17 Feb 2023 06:16:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229904AbjBQLQn (ORCPT ); Fri, 17 Feb 2023 06:16:43 -0500 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40D6B66CD3 for ; Fri, 17 Feb 2023 03:16:25 -0800 (PST) Received: by mail-lj1-x22a.google.com with SMTP id h30so939688ljb.13 for ; Fri, 17 Feb 2023 03:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9wJq/iqxZ5CY0MZ8/qvZLLKvRq4WEHI7wVVOEpRQbpw=; b=MC0poj+iXKkHo+R2YU6rbuzxgf0jQAaVXqzsfYcg40ZF3p+sobPJSFb784cEKAph2V omQrmbXAmq+e1xvIDhXtXGahku8AXRkp8Hz9BUHYS5N2NI75Ie5HsrrrN1BrptallZmn 2TwPVpLlWyflzhC3CIJhIZ1SaXKypl1Zl0Cp2u4JDIn8IGlNRUVSobKIjOAUsFJgLCn8 HhnKdH+BWhPGRNFicVt4LPpwUvJgaFW9pffXdR9uy10rZ3UDaL1Nto35bJYb/NaH5hcx +KiYim1dXAd7QtUADL/nmLwNcpU2tZuRtQJm4+FhOK/8RdcUA45ToDW7owata6sb3Ddb /jlA== 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=9wJq/iqxZ5CY0MZ8/qvZLLKvRq4WEHI7wVVOEpRQbpw=; b=I7bZdbrC9yaXKFp7JjE2f42LDzewpJlF1BgzFT1jrQpZtTxhZ0Kq6makGbrs90OLWY AWmULjQs/0t6JNSfhr+qky54UfW6xiyidAC4q73/7eYEWMG6Qk/FV98JnMuf1XoXB3Ii bLWLewegAsFO+kcB7H6ceQo+ywP6uFZxr4HQPt4D/Yf+fPXFq5/oFoadydV2fXP8rWza MLrlnSHPcjIqgiiKMwhVEXvObAEBnZvBvTM8pa1eFmRzhEmuKC3/Fa3pTfy691l2YoYM BAILHkIPv3PVAFkSsxYTCLd8fDPiAP6fCTU1w2il9xdPAKJ5rfzA7WQ9OH60DCthMiJw xLVQ== X-Gm-Message-State: AO0yUKWj3pFD1mfkQ97XbERvsj6RxepgcsOVRsXm9h8VBEAFJm2VDek0 Cp+8VW1MY+xjnnC6+GV8eBU7QH+x07aaruWG X-Google-Smtp-Source: AK7set+MHcEoedvXSDYloedEh6Y9Sy1Tzo13ZFKtLdr645Gc9MRYQ7gRjlpO3L0eUgXSthIRnqVygQ== X-Received: by 2002:a05:651c:1031:b0:293:4b8d:daeb with SMTP id w17-20020a05651c103100b002934b8ddaebmr66584ljm.34.1676632583401; Fri, 17 Feb 2023 03:16:23 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id u21-20020a2e9b15000000b002935899fe3fsm554818lji.116.2023.02.17.03.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 03:16:23 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] arm64: dts: qcom: sc7280: Add qcom, smmu-500 to Adreno SMMU Date: Fri, 17 Feb 2023 12:16:10 +0100 Message-Id: <20230217111613.306978-3-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217111613.306978-1-konrad.dybcio@linaro.org> References: <20230217111613.306978-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the fallback Qualcomm SMMU500 compatible to the Adreno SMMU. Signed-off-by: Konrad Dybcio --- v1 -> v2: No changes arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index bdcb74925313..a8227bb6b336 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2677,7 +2677,8 @@ dma@117f000 { }; adreno_smmu: iommu@3da0000 { - compatible = "qcom,sc7280-smmu-500", "qcom,adreno-smmu", "arm,mmu-500"; + compatible = "qcom,sc7280-smmu-500", "qcom,adreno-smmu", + "qcom,smmu-500", "arm,mmu-500"; reg = <0 0x03da0000 0 0x20000>; #iommu-cells = <2>; #global-interrupts = <2>; From patchwork Fri Feb 17 11:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 654788 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 7E18FC64EC4 for ; Fri, 17 Feb 2023 11:16:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230025AbjBQLQ5 (ORCPT ); Fri, 17 Feb 2023 06:16:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230032AbjBQLQs (ORCPT ); Fri, 17 Feb 2023 06:16:48 -0500 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48BE7125AB for ; Fri, 17 Feb 2023 03:16:28 -0800 (PST) Received: by mail-lj1-x22b.google.com with SMTP id i14so2459817ljn.5 for ; Fri, 17 Feb 2023 03:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HmoMqnRP5kZAiXq2v7CNcctUC+zodegcmF76bZvlIAw=; b=c9ZZv4rfZBZFzWEA/W4nxzpP5BhRgY9jBI02O6onfHggcezzcuWXJYJqtcWCHbm0mT 8znT6eB/RftHt6F5swPqmxl/ow+oPAX+ATKuAIWxQ+dbIZ8/154bCTfi8ccf7yFAVEfk 89qRZKPexUTswZ3Uc/WpUy0jPV8Gvf6/YcG5UV7yMPgBlsj/tKja6DNIwal3/nkLZD8W pHqLuWe3ctTNUHjyBby4nO5DRH3/I75JCS1yL1I4Rbzhhhz0bGIedRXkHlkVGoKQKiAs 7f6itx6ijSPdMoMVVMavTvdjc3s5LMwGyeSfYJqAyCOg3/LUBokSI+AHWypbR+kjS7ls KF6w== 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=HmoMqnRP5kZAiXq2v7CNcctUC+zodegcmF76bZvlIAw=; b=hO9lKHrMFRg+igEWrHzdTuRTXW05zROmbvOO9zNl55HwPh4OK6bY1HaHorzvh2aUa6 qVsCejfr25u3JLoFTTSGDIp+jbfsr9hrJz0JHZnV7Ps0+eVPIRHGYCbjlc6Xi4gh7Zfs mBa0c2csR+R00SwBBJ2xBfWfy/XNPVUzSR7FMWdJm0tSvXE78WOD2MBRpJ5tCZYlscM3 YRgnC6cBHSWH9muGLZWuRsr67xJ7qtMLL+vOG0t3BIkxICax9DhQr2GQ+BDuxiu49nTd vrFP0myeWeAlfJ9Lrz3hZjt0T0ujHVujbNn9b1KcWDqL+ho/XIPHTdQi+NCll9ref+32 CiVw== X-Gm-Message-State: AO0yUKWC4u/GjBThWp1OMnhtVYWwHg6rJyD12b9V2tBcKU56SvAh9md1 en79tHajdWgCeCamYc01uExpeihv359dZ0j/ X-Google-Smtp-Source: AK7set95lmN1eG8L+WqSsDgz3Maqx82n55DwsLlhEGEwttIK1QfQtsLZabqbklItAavuPKe3Mak4tQ== X-Received: by 2002:a05:651c:1a06:b0:293:4e4b:bf5a with SMTP id by6-20020a05651c1a0600b002934e4bbf5amr1795039ljb.1.1676632586440; Fri, 17 Feb 2023 03:16:26 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id u21-20020a2e9b15000000b002935899fe3fsm554818lji.116.2023.02.17.03.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 03:16:26 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] arm64: dts: qcom: sm8250: Add qcom, smmu-500 to Adreno SMMU Date: Fri, 17 Feb 2023 12:16:12 +0100 Message-Id: <20230217111613.306978-5-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217111613.306978-1-konrad.dybcio@linaro.org> References: <20230217111613.306978-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the fallback Qualcomm SMMU500 compatible to the Adreno SMMU. Signed-off-by: Konrad Dybcio --- v1 -> v2: No changes arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 6a0100822d3d..13f5526d97b4 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2701,7 +2701,8 @@ gpucc: clock-controller@3d90000 { }; adreno_smmu: iommu@3da0000 { - compatible = "qcom,sm8250-smmu-500", "qcom,adreno-smmu", "arm,mmu-500"; + compatible = "qcom,sm8250-smmu-500", "qcom,adreno-smmu", + "qcom,smmu-500", "arm,mmu-500"; reg = <0 0x03da0000 0 0x10000>; #iommu-cells = <2>; #global-interrupts = <2>;