From: Rob Herring <robh@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, soc@kernel.org,
Andre Przywara <andre.przywara@arm.com>,
Robert Richter <rrichter@marvell.com>, Jon Loeliger <jdl@jdl.com>,
Alexander Graf <graf@amazon.com>,
Matthias Brugger <mbrugger@suse.com>,
Mark Langsdorf <mlangsdo@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Borislav Petkov <bp@alien8.de>, Cornelia Huck <cohuck@redhat.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
"David S. Miller" <davem@davemloft.net>,
devicetree@vger.kernel.org, Eric Auger <eric.auger@redhat.com>,
iommu@lists.linux-foundation.org,
James Morse <james.morse@arm.com>, Jens Axboe <axboe@kernel.dk>,
Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-edac@vger.kernel.org, linux-ide@vger.kernel.org,
linux-pm@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
netdev@vger.kernel.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Robin Murphy <robin.murphy@arm.com>,
Stephen Boyd <sboyd@kernel.org>, Tony Luck <tony.luck@intel.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
Will Deacon <will@kernel.org>
Subject: [RFC PATCH 06/11] iommu: arm-smmu: Remove Calxeda secure mode quirk
Date: Tue, 18 Feb 2020 11:13:16 -0600 [thread overview]
Message-ID: <20200218171321.30990-7-robh@kernel.org> (raw)
In-Reply-To: <20200218171321.30990-1-robh@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux-foundation.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
Do not apply yet.
drivers/iommu/arm-smmu-impl.c | 43 -----------------------------------
1 file changed, 43 deletions(-)
diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm-smmu-impl.c
index 74d97a886e93..a3be8712d27f 100644
--- a/drivers/iommu/arm-smmu-impl.c
+++ b/drivers/iommu/arm-smmu-impl.c
@@ -9,45 +9,6 @@
#include "arm-smmu.h"
-
-static int arm_smmu_gr0_ns(int offset)
-{
- switch(offset) {
- case ARM_SMMU_GR0_sCR0:
- case ARM_SMMU_GR0_sACR:
- case ARM_SMMU_GR0_sGFSR:
- case ARM_SMMU_GR0_sGFSYNR0:
- case ARM_SMMU_GR0_sGFSYNR1:
- case ARM_SMMU_GR0_sGFSYNR2:
- return offset + 0x400;
- default:
- return offset;
- }
-}
-
-static u32 arm_smmu_read_ns(struct arm_smmu_device *smmu, int page,
- int offset)
-{
- if (page == ARM_SMMU_GR0)
- offset = arm_smmu_gr0_ns(offset);
- return readl_relaxed(arm_smmu_page(smmu, page) + offset);
-}
-
-static void arm_smmu_write_ns(struct arm_smmu_device *smmu, int page,
- int offset, u32 val)
-{
- if (page == ARM_SMMU_GR0)
- offset = arm_smmu_gr0_ns(offset);
- writel_relaxed(val, arm_smmu_page(smmu, page) + offset);
-}
-
-/* Since we don't care for sGFAR, we can do without 64-bit accessors */
-static const struct arm_smmu_impl calxeda_impl = {
- .read_reg = arm_smmu_read_ns,
- .write_reg = arm_smmu_write_ns,
-};
-
-
struct cavium_smmu {
struct arm_smmu_device smmu;
u32 id_base;
@@ -166,10 +127,6 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)
break;
}
- if (of_property_read_bool(smmu->dev->of_node,
- "calxeda,smmu-secure-config-access"))
- smmu->impl = &calxeda_impl;
-
if (of_device_is_compatible(smmu->dev->of_node, "qcom,sdm845-smmu-500"))
return qcom_smmu_impl_init(smmu);
--
2.20.1
next prev parent reply other threads:[~2020-02-18 17:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 17:13 [RFC PATCH 00/11] Removing Calxeda platform support Rob Herring
2020-02-18 17:13 ` [RFC PATCH 01/11] vfio: Remove Calxeda XGMAC reset driver Rob Herring
2020-02-24 13:07 ` Auger Eric
2020-02-18 17:13 ` [RFC PATCH 02/11] ata: Remove Calxeda AHCI driver Rob Herring
2020-02-20 17:07 ` Mark Langsdorf
2020-02-18 17:13 ` [RFC PATCH 03/11] cpuidle: Remove Calxeda driver Rob Herring
2020-02-18 17:35 ` Daniel Lezcano
2020-02-18 17:13 ` [RFC PATCH 04/11] cpufreq: " Rob Herring
2020-02-19 1:49 ` Viresh Kumar
2020-02-20 17:06 ` Mark Langsdorf
2020-02-18 17:13 ` [RFC PATCH 05/11] EDAC: Remove Calxeda drivers Rob Herring
2020-02-18 17:33 ` Borislav Petkov
2020-02-19 11:57 ` Robert Richter
2020-02-18 17:13 ` Rob Herring [this message]
2020-02-18 17:20 ` [RFC PATCH 06/11] iommu: arm-smmu: Remove Calxeda secure mode quirk Will Deacon
2020-02-18 17:32 ` Robin Murphy
2020-02-25 22:01 ` Rob Herring
[not found] ` <20200228100446.GA2395@willie-the-truck>
2020-02-28 10:25 ` Andre Przywara
[not found] ` <20200228105024.GC2395@willie-the-truck>
2020-02-28 13:42 ` Andre Przywara
[not found] ` <20200228135645.GA4745@willie-the-truck>
2020-02-28 14:11 ` Andre Przywara
2020-02-18 17:13 ` [RFC PATCH 07/11] net: Remove Calxeda XGMAC driver Rob Herring
2020-02-18 17:13 ` [RFC PATCH 08/11] clk: Remove Calxeda driver Rob Herring
2020-02-18 17:13 ` [RFC PATCH 09/11] ARM: Remove Calxeda platform support Rob Herring
2020-02-18 17:13 ` [RFC PATCH 10/11] ARM: dts: Remove Calxeda platforms Rob Herring
2020-02-18 17:13 ` [RFC PATCH 11/11] dt-bindings: Remove Calxeda platforms bindings Rob Herring
2020-02-18 17:22 ` Will Deacon
2020-02-18 17:30 ` Rob Herring
2020-02-18 18:13 ` [RFC PATCH 00/11] Removing Calxeda platform support Andre Przywara
2020-02-18 18:40 ` Rob Herring
2020-02-18 18:51 ` Florian Fainelli
2020-02-19 22:54 ` Olof Johansson
2020-02-20 1:38 ` André Przywara
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=20200218171321.30990-7-robh@kernel.org \
--to=robh@kernel.org \
--cc=alex.williamson@redhat.com \
--cc=andre.przywara@arm.com \
--cc=axboe@kernel.dk \
--cc=bp@alien8.de \
--cc=cohuck@redhat.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=graf@amazon.com \
--cc=iommu@lists.linux-foundation.org \
--cc=james.morse@arm.com \
--cc=jdl@jdl.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mbrugger@suse.com \
--cc=mchehab@kernel.org \
--cc=mlangsdo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=rrichter@marvell.com \
--cc=sboyd@kernel.org \
--cc=soc@kernel.org \
--cc=tony.luck@intel.com \
--cc=viresh.kumar@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).