From: Janne Grunau <j@jannau.net>
To: iommu@lists.linux-foundation.org
Cc: linux-arm-kernel@lists.infradead.org,
Hector Martin <marcan@marcan.st>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
linux-kernel@vger.kernel.org, asahi@lists.linux.dev,
Will Deacon <will@kernel.org>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>
Subject: [PATCH v3 3/5] iommu/io-pgtable: Add DART subpage protection support
Date: Tue, 21 Jun 2022 09:18:46 +0200 [thread overview]
Message-ID: <20220621071848.14834-4-j@jannau.net> (raw)
In-Reply-To: <20220621071848.14834-1-j@jannau.net>
From: Sven Peter <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>
Signed-off-by: Janne Grunau <j@jannau.net>
---
Changes in v3:
- apply change to io-pgtable-dart.c
drivers/iommu/io-pgtable-dart.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c
index 0c5222942c65..fa8025c03bb5 100644
--- a/drivers/iommu/io-pgtable-dart.c
+++ b/drivers/iommu/io-pgtable-dart.c
@@ -14,6 +14,7 @@
#define pr_fmt(fmt) "dart io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -63,6 +64,9 @@
/* Calculate the block/page mapping size at level l for pagetable in d. */
#define DART_BLOCK_SIZE(l, d) (1ULL << DART_LVL_SHIFT(l, d))
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
#define APPLE_DART1_PADDR_MASK GENMASK_ULL(35, 12)
/* Apple DART1 protection bits */
@@ -140,6 +144,10 @@ static void __dart_init_pte(struct dart_io_pgtable *data,
pte |= APPLE_DART_PTE_VALID;
+ /* 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.35.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: Janne Grunau <j@jannau.net>
To: iommu@lists.linux-foundation.org
Cc: Konrad Dybcio <konrad.dybcio@somainline.org>,
asahi@lists.linux.dev, Sven Peter <sven@svenpeter.dev>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Hector Martin <marcan@marcan.st>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/5] iommu/io-pgtable: Add DART subpage protection support
Date: Tue, 21 Jun 2022 09:18:46 +0200 [thread overview]
Message-ID: <20220621071848.14834-4-j@jannau.net> (raw)
In-Reply-To: <20220621071848.14834-1-j@jannau.net>
From: Sven Peter <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>
Signed-off-by: Janne Grunau <j@jannau.net>
---
Changes in v3:
- apply change to io-pgtable-dart.c
drivers/iommu/io-pgtable-dart.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c
index 0c5222942c65..fa8025c03bb5 100644
--- a/drivers/iommu/io-pgtable-dart.c
+++ b/drivers/iommu/io-pgtable-dart.c
@@ -14,6 +14,7 @@
#define pr_fmt(fmt) "dart io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -63,6 +64,9 @@
/* Calculate the block/page mapping size at level l for pagetable in d. */
#define DART_BLOCK_SIZE(l, d) (1ULL << DART_LVL_SHIFT(l, d))
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
#define APPLE_DART1_PADDR_MASK GENMASK_ULL(35, 12)
/* Apple DART1 protection bits */
@@ -140,6 +144,10 @@ static void __dart_init_pte(struct dart_io_pgtable *data,
pte |= APPLE_DART_PTE_VALID;
+ /* 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.35.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: Janne Grunau <j@jannau.net>
To: iommu@lists.linux-foundation.org
Cc: Konrad Dybcio <konrad.dybcio@somainline.org>,
asahi@lists.linux.dev, Sven Peter <sven@svenpeter.dev>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Hector Martin <marcan@marcan.st>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/5] iommu/io-pgtable: Add DART subpage protection support
Date: Tue, 21 Jun 2022 09:18:46 +0200 [thread overview]
Message-ID: <20220621071848.14834-4-j@jannau.net> (raw)
In-Reply-To: <20220621071848.14834-1-j@jannau.net>
From: Sven Peter <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>
Signed-off-by: Janne Grunau <j@jannau.net>
---
Changes in v3:
- apply change to io-pgtable-dart.c
drivers/iommu/io-pgtable-dart.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c
index 0c5222942c65..fa8025c03bb5 100644
--- a/drivers/iommu/io-pgtable-dart.c
+++ b/drivers/iommu/io-pgtable-dart.c
@@ -14,6 +14,7 @@
#define pr_fmt(fmt) "dart io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -63,6 +64,9 @@
/* Calculate the block/page mapping size at level l for pagetable in d. */
#define DART_BLOCK_SIZE(l, d) (1ULL << DART_LVL_SHIFT(l, d))
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
#define APPLE_DART1_PADDR_MASK GENMASK_ULL(35, 12)
/* Apple DART1 protection bits */
@@ -140,6 +144,10 @@ static void __dart_init_pte(struct dart_io_pgtable *data,
pte |= APPLE_DART_PTE_VALID;
+ /* 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.35.1
next prev parent reply other threads:[~2022-06-21 7:18 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 7:18 [PATCH v3 0/5] iommu: M1 Pro/Max DART support Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` [PATCH v3 1/5] dt-bindings: iommu: dart: add t6000 compatible Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` [PATCH v3 2/5] iommu/io-pgtable: Move Apple DART support to its own file Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-27 15:09 ` Robin Murphy
2022-06-27 15:09 ` Robin Murphy
2022-06-27 15:09 ` Robin Murphy
2022-09-01 0:15 ` Janne Grunau
2022-09-01 0:15 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau [this message]
2022-06-21 7:18 ` [PATCH v3 3/5] iommu/io-pgtable: Add DART subpage protection support Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` [PATCH v3 4/5] iommu/io-pgtable-dart: Add DART PTE support for t6000 Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-27 15:13 ` Robin Murphy
2022-06-27 15:13 ` Robin Murphy
2022-06-27 15:13 ` Robin Murphy
2022-07-31 7:04 ` Hector Martin
2022-07-31 7:04 ` Hector Martin
2022-09-01 0:22 ` Janne Grunau
2022-09-01 0:22 ` Janne Grunau
2022-06-21 7:18 ` [PATCH v3 5/5] iommu: dart: Support t6000 variant Janne Grunau
2022-06-21 7:18 ` Janne Grunau
2022-06-21 7:18 ` Janne Grunau
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=20220621071848.14834-4-j@jannau.net \
--to=j@jannau.net \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--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.