From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Thierry Reding <thierry.reding@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Jonathan Marek <jonathan@marek.ca>,
linux-arm-msm@vger.kernel.org
Subject: [PATCH 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS
Date: Wed, 8 Jul 2020 22:01:41 -0700 [thread overview]
Message-ID: <20200709050145.3520931-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20200709050145.3520931-1-bjorn.andersson@linaro.org>
Turn all stream mappings marked as valid into BYPASS. This allows the
platform specific implementation to configure stream mappings to match
the boot loader's configuration for e.g. display to continue to function
through the reset of the SMMU.
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/iommu/arm-smmu.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 243bc4cb2705..2e27cf9815ab 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1924,6 +1924,22 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
return 0;
}
+int arm_smmu_setup_identity(struct arm_smmu_device *smmu)
+{
+ int i;
+
+ for (i = 0; i < smmu->num_mapping_groups; i++) {
+ if (smmu->smrs[i].valid) {
+ smmu->s2crs[i].type = S2CR_TYPE_BYPASS;
+ smmu->s2crs[i].privcfg = S2CR_PRIVCFG_DEFAULT;
+ smmu->s2crs[i].cbndx = 0xff;
+ smmu->s2crs[i].count++;
+ }
+ }
+
+ return 0;
+}
+
struct arm_smmu_match_data {
enum arm_smmu_arch_version version;
enum arm_smmu_implementation model;
@@ -2181,6 +2197,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
if (err)
return err;
+ err = arm_smmu_setup_identity(smmu);
+ if (err)
+ return err;
+
if (smmu->version == ARM_SMMU_V2) {
if (smmu->num_context_banks > smmu->num_context_irqs) {
dev_err(dev,
--
2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Thierry Reding <thierry.reding@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Cc: linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org,
Jonathan Marek <jonathan@marek.ca>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS
Date: Wed, 8 Jul 2020 22:01:41 -0700 [thread overview]
Message-ID: <20200709050145.3520931-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20200709050145.3520931-1-bjorn.andersson@linaro.org>
Turn all stream mappings marked as valid into BYPASS. This allows the
platform specific implementation to configure stream mappings to match
the boot loader's configuration for e.g. display to continue to function
through the reset of the SMMU.
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/iommu/arm-smmu.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 243bc4cb2705..2e27cf9815ab 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1924,6 +1924,22 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
return 0;
}
+int arm_smmu_setup_identity(struct arm_smmu_device *smmu)
+{
+ int i;
+
+ for (i = 0; i < smmu->num_mapping_groups; i++) {
+ if (smmu->smrs[i].valid) {
+ smmu->s2crs[i].type = S2CR_TYPE_BYPASS;
+ smmu->s2crs[i].privcfg = S2CR_PRIVCFG_DEFAULT;
+ smmu->s2crs[i].cbndx = 0xff;
+ smmu->s2crs[i].count++;
+ }
+ }
+
+ return 0;
+}
+
struct arm_smmu_match_data {
enum arm_smmu_arch_version version;
enum arm_smmu_implementation model;
@@ -2181,6 +2197,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
if (err)
return err;
+ err = arm_smmu_setup_identity(smmu);
+ if (err)
+ return err;
+
if (smmu->version == ARM_SMMU_V2) {
if (smmu->num_context_banks > smmu->num_context_irqs) {
dev_err(dev,
--
2.26.2
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Thierry Reding <thierry.reding@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Cc: linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org,
Jonathan Marek <jonathan@marek.ca>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS
Date: Wed, 8 Jul 2020 22:01:41 -0700 [thread overview]
Message-ID: <20200709050145.3520931-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20200709050145.3520931-1-bjorn.andersson@linaro.org>
Turn all stream mappings marked as valid into BYPASS. This allows the
platform specific implementation to configure stream mappings to match
the boot loader's configuration for e.g. display to continue to function
through the reset of the SMMU.
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/iommu/arm-smmu.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 243bc4cb2705..2e27cf9815ab 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1924,6 +1924,22 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
return 0;
}
+int arm_smmu_setup_identity(struct arm_smmu_device *smmu)
+{
+ int i;
+
+ for (i = 0; i < smmu->num_mapping_groups; i++) {
+ if (smmu->smrs[i].valid) {
+ smmu->s2crs[i].type = S2CR_TYPE_BYPASS;
+ smmu->s2crs[i].privcfg = S2CR_PRIVCFG_DEFAULT;
+ smmu->s2crs[i].cbndx = 0xff;
+ smmu->s2crs[i].count++;
+ }
+ }
+
+ return 0;
+}
+
struct arm_smmu_match_data {
enum arm_smmu_arch_version version;
enum arm_smmu_implementation model;
@@ -2181,6 +2197,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
if (err)
return err;
+ err = arm_smmu_setup_identity(smmu);
+ if (err)
+ return err;
+
if (smmu->version == ARM_SMMU_V2) {
if (smmu->num_context_banks > smmu->num_context_irqs) {
dev_err(dev,
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-09 5:01 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 5:01 [PATCH 0/5] iommu/arm-smmu: Support maintaining bootloader mappings Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson [this message]
2020-07-09 5:01 ` [PATCH 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` [RFC PATCH] iommu/arm-smmu: arm_smmu_setup_identity() can be static kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-13 21:25 ` kernel test robot
2020-07-15 23:20 ` [PATCH 1/5] iommu/arm-smmu: Make all valid stream mappings BYPASS kernel test robot
2020-07-15 23:20 ` kernel test robot
2020-07-15 23:20 ` kernel test robot
2020-07-15 23:20 ` kernel test robot
2020-07-09 5:01 ` [PATCH 2/5] iommu/arm-smmu: Emulate bypass by using context banks Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 16:17 ` Rob Clark
2020-07-09 16:17 ` Rob Clark
2020-07-09 16:17 ` Rob Clark
2020-07-09 16:48 ` Bjorn Andersson
2020-07-09 16:48 ` Bjorn Andersson
2020-07-09 16:48 ` Bjorn Andersson
2020-07-09 16:56 ` Rob Clark
2020-07-09 16:56 ` Rob Clark
2020-07-09 16:56 ` Rob Clark
2020-07-09 18:55 ` Rob Clark
2020-07-09 18:55 ` Rob Clark
2020-07-09 18:55 ` Rob Clark
2020-07-09 19:40 ` Bjorn Andersson
2020-07-09 19:40 ` Bjorn Andersson
2020-07-09 19:40 ` Bjorn Andersson
2020-07-09 5:01 ` [PATCH 3/5] iommu/arm-smmu: Move SMR and S2CR definitions to header file Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` [PATCH 4/5] iommu/arm-smmu-qcom: Consstently initialize stream mappings Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 7:32 ` Vinod Koul
2020-07-09 7:32 ` Vinod Koul
2020-07-09 7:32 ` Vinod Koul
2020-07-09 5:01 ` [PATCH 5/5] iommu/arm-smmu: Setup identity domain for boot mappings Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 5:01 ` Bjorn Andersson
2020-07-09 15:50 ` Laurentiu Tudor
2020-07-09 15:50 ` Laurentiu Tudor
2020-07-09 15:50 ` Laurentiu Tudor
2020-07-09 19:57 ` Bjorn Andersson
2020-07-09 19:57 ` Bjorn Andersson
2020-07-09 19:57 ` Bjorn Andersson
2020-07-28 15:27 ` Laurentiu Tudor
2020-07-28 15:27 ` Laurentiu Tudor
2020-07-28 15:27 ` Laurentiu Tudor
2020-07-09 7:33 ` [PATCH 0/5] iommu/arm-smmu: Support maintaining bootloader mappings Vinod Koul
2020-07-09 7:33 ` Vinod Koul
2020-07-09 7:33 ` Vinod Koul
2020-07-10 5:25 ` John Stultz
2020-07-10 5:25 ` John Stultz
2020-07-10 5:25 ` John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709050145.3520931-2-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathan@marek.ca \
--cc=joro@8bytes.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.