From: Janne Grunau <j@jannau.net>
To: iommu@lists.linux.dev
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>,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 3/5] iommu/io-pgtable: Add DART subpage protection support
Date: Fri, 16 Sep 2022 11:41:50 +0200 [thread overview]
Message-ID: <20220916094152.87137-4-j@jannau.net> (raw)
In-Reply-To: <20220916094152.87137-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>
---
(no changes since v3)
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 312d40528748..665a52e5c9b0 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>
@@ -40,6 +41,9 @@
#define DART_PTES_PER_TABLE(d) \
(DART_GRANULE(d) >> ilog2(sizeof(dart_iopte)))
+#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 */
@@ -108,6 +112,10 @@ static int dart_init_pte(struct dart_io_pgtable *data,
return -EEXIST;
}
+ /* 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);
+
pte |= APPLE_DART1_PTE_PROT_SP_DIS;
pte |= APPLE_DART_PTE_VALID;
--
2.35.1
next prev parent reply other threads:[~2022-09-16 9:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 9:41 [PATCH v5 0/5] iommu: M1 Pro/Max DART support Janne Grunau
2022-09-16 9:41 ` [PATCH v5 1/5] dt-bindings: iommu: dart: add t6000 compatible Janne Grunau
2022-09-22 12:05 ` Hector Martin
2022-09-16 9:41 ` [PATCH v5 2/5] iommu/io-pgtable: Move Apple DART support to its own file Janne Grunau
2022-09-22 14:05 ` Hector Martin
2022-09-16 9:41 ` Janne Grunau [this message]
2022-09-16 11:57 ` [PATCH v5 3/5] iommu/io-pgtable: Add DART subpage protection support Rob Herring
2022-09-16 9:41 ` [PATCH v5 4/5] iommu/io-pgtable-dart: Add DART PTE support for t6000 Janne Grunau
2022-09-16 12:03 ` Rob Herring
2022-09-16 9:41 ` [PATCH v5 5/5] iommu: dart: Support t6000 variant Janne Grunau
2022-09-16 12:05 ` Rob Herring
2022-09-21 13:20 ` [PATCH v5 0/5] iommu: M1 Pro/Max DART support Robin Murphy
2022-09-22 14:05 ` Hector Martin
2022-09-26 11:50 ` 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=20220916094152.87137-4-j@jannau.net \
--to=j@jannau.net \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=iommu@lists.linux-foundation.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--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 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).