From: Sven Peter via iommu <iommu@lists.linux-foundation.org>
To: iommu@lists.linux-foundation.org, Robin Murphy <robin.murphy@arm.com>
Cc: devicetree@vger.kernel.org, Sven Peter <sven@svenpeter.dev>,
Will Deacon <will@kernel.org>, Hector Martin <marcan@marcan.st>,
linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
linux-arm-kernel@lists.infradead.org, Janne Grunau <j@jannau.net>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>
Subject: [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support
Date: Wed, 17 Nov 2021 22:15:07 +0100 [thread overview]
Message-ID: <20211117211509.28066-3-sven@svenpeter.dev> (raw)
In-Reply-To: <20211117211509.28066-1-sven@svenpeter.dev>
DART allows to only expose a subpage to the device. While this is an
optional feature on the M1 DARTs the new ones present on the Pro/Max
models require this field in every PTE.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/io-pgtable-arm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index dd9e47189d0d..a8c660b8b3e9 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -10,6 +10,7 @@
#define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -133,6 +134,9 @@
#define APPLE_DART_PTE_PROT_NO_WRITE (1<<7)
#define APPLE_DART_PTE_PROT_NO_READ (1<<8)
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
/* IOPTE accessors */
#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))
@@ -273,6 +277,12 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
else
pte |= ARM_LPAE_PTE_TYPE_BLOCK;
+ if (data->iop.fmt == APPLE_DART) {
+ /* subpage protection: always allow access to the entire page */
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_START, 0);
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_END, 0xfff);
+ }
+
for (i = 0; i < num_entries; i++)
ptep[i] = pte | paddr_to_iopte(paddr + i * sz, data);
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Sven Peter <sven@svenpeter.dev>
To: iommu@lists.linux-foundation.org, Robin Murphy <robin.murphy@arm.com>
Cc: Sven Peter <sven@svenpeter.dev>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Janne Grunau <j@jannau.net>, Hector Martin <marcan@marcan.st>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support
Date: Wed, 17 Nov 2021 22:15:07 +0100 [thread overview]
Message-ID: <20211117211509.28066-3-sven@svenpeter.dev> (raw)
In-Reply-To: <20211117211509.28066-1-sven@svenpeter.dev>
DART allows to only expose a subpage to the device. While this is an
optional feature on the M1 DARTs the new ones present on the Pro/Max
models require this field in every PTE.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/io-pgtable-arm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index dd9e47189d0d..a8c660b8b3e9 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -10,6 +10,7 @@
#define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -133,6 +134,9 @@
#define APPLE_DART_PTE_PROT_NO_WRITE (1<<7)
#define APPLE_DART_PTE_PROT_NO_READ (1<<8)
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
/* IOPTE accessors */
#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))
@@ -273,6 +277,12 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
else
pte |= ARM_LPAE_PTE_TYPE_BLOCK;
+ if (data->iop.fmt == APPLE_DART) {
+ /* subpage protection: always allow access to the entire page */
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_START, 0);
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_END, 0xfff);
+ }
+
for (i = 0; i < num_entries; i++)
ptep[i] = pte | paddr_to_iopte(paddr + i * sz, data);
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sven Peter <sven@svenpeter.dev>
To: iommu@lists.linux-foundation.org, Robin Murphy <robin.murphy@arm.com>
Cc: Sven Peter <sven@svenpeter.dev>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Janne Grunau <j@jannau.net>, Hector Martin <marcan@marcan.st>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support
Date: Wed, 17 Nov 2021 22:15:07 +0100 [thread overview]
Message-ID: <20211117211509.28066-3-sven@svenpeter.dev> (raw)
In-Reply-To: <20211117211509.28066-1-sven@svenpeter.dev>
DART allows to only expose a subpage to the device. While this is an
optional feature on the M1 DARTs the new ones present on the Pro/Max
models require this field in every PTE.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/io-pgtable-arm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index dd9e47189d0d..a8c660b8b3e9 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -10,6 +10,7 @@
#define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -133,6 +134,9 @@
#define APPLE_DART_PTE_PROT_NO_WRITE (1<<7)
#define APPLE_DART_PTE_PROT_NO_READ (1<<8)
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
/* IOPTE accessors */
#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))
@@ -273,6 +277,12 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
else
pte |= ARM_LPAE_PTE_TYPE_BLOCK;
+ if (data->iop.fmt == APPLE_DART) {
+ /* subpage protection: always allow access to the entire page */
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_START, 0);
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_END, 0xfff);
+ }
+
for (i = 0; i < num_entries; i++)
ptep[i] = pte | paddr_to_iopte(paddr + i * sz, data);
--
2.25.1
next prev parent reply other threads:[~2021-11-17 21:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter via iommu
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible Sven Peter via iommu
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` Sven Peter
2021-11-29 22:50 ` Rob Herring
2021-11-29 22:50 ` Rob Herring
2021-11-29 22:50 ` Rob Herring
2021-11-17 21:15 ` Sven Peter via iommu [this message]
2021-11-17 21:15 ` [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support Sven Peter
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` [PATCH 3/4] iommu/io-pgtable: Add DART PTE support for t6000 Sven Peter via iommu
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` [PATCH 4/4] iommu: dart: Support t6000 variant Sven Peter via iommu
2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` Sven Peter
2021-11-30 20:56 ` [PATCH 0/4] iommu: M1 Pro/Max DART support Janne Grunau
2021-11-30 20:56 ` Janne Grunau
2021-11-30 20:56 ` Janne Grunau
2021-12-06 12:07 ` Joerg Roedel
2021-12-06 12:07 ` Joerg Roedel
2021-12-06 12:07 ` Joerg Roedel
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=20211117211509.28066-3-sven@svenpeter.dev \
--to=iommu@lists.linux-foundation.org \
--cc=alyssa@rosenzweig.io \
--cc=devicetree@vger.kernel.org \
--cc=j@jannau.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=sven@svenpeter.dev \
--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.