Skip to content

Commit 954e65b

Browse files
committed
arm64: dts: apple: Remove no-map from pagetables region
This should still be compatible with older kernels, since this region is always mapped cached. Signed-off-by: Asahi Lina <[email protected]>
1 parent 7b64aca commit 954e65b

5 files changed

Lines changed: 1 addition & 24 deletions

File tree

arch/arm64/boot/dts/apple/t600x-common.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@
491491

492492
uat_pagetables: uat-pagetables {
493493
reg = <0 0 0 0>;
494-
no-map;
495494
};
496495

497496
uat_ttbs: uat-ttbs {

arch/arm64/boot/dts/apple/t602x-common.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@
605605

606606
uat_pagetables: uat-pagetables {
607607
reg = <0 0 0 0>;
608-
no-map;
609608
};
610609

611610
uat_ttbs: uat-ttbs {

arch/arm64/boot/dts/apple/t8103.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@
446446

447447
uat_pagetables: uat-pagetables {
448448
reg = <0 0 0 0>;
449-
no-map;
450449
};
451450

452451
uat_ttbs: uat-ttbs {

arch/arm64/boot/dts/apple/t8112.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@
474474

475475
uat_pagetables: uat-pagetables {
476476
reg = <0x0 0 0 0>;
477-
no-map;
478477
};
479478

480479
uat_ttbs: uat-ttbs {

drivers/gpu/drm/asahi/mmu.rs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! to currently active GPU VM contexts, as well as the individual `Vm` operations to map and
99
//! unmap buffer objects into a single user or kernel address space.
1010
//!
11-
//! The actual page table management is delegated to the common kernel `io_pgtable` code.
11+
//! The actual page table management is in the `pt` module.
1212
1313
use core::fmt::Debug;
1414
use core::mem::size_of;
@@ -50,23 +50,6 @@ const UAT_USER_CTX_START: usize = 1;
5050
/// Number of available user contexts
5151
const UAT_USER_CTX: usize = UAT_NUM_CTX - UAT_USER_CTX_START;
5252

53-
/// Number of bits in a page offset.
54-
pub(crate) const UAT_PGBIT: usize = 14;
55-
/// UAT page size.
56-
pub(crate) const UAT_PGSZ: usize = 1 << UAT_PGBIT;
57-
/// UAT page offset mask.
58-
pub(crate) const UAT_PGMSK: usize = UAT_PGSZ - 1;
59-
60-
type Pte = AtomicU64;
61-
62-
/// Number of PTEs per page.
63-
const UAT_NPTE: usize = UAT_PGSZ / size_of::<Pte>();
64-
65-
/// UAT input address space (user)
66-
pub(crate) const UAT_IAS: usize = 39;
67-
/// "Fake" kernel UAT input address space (one page level lower)
68-
pub(crate) const UAT_IAS_KERN: usize = 36;
69-
7053
/// Lower/user base VA
7154
pub(crate) const IOVA_USER_BASE: u64 = UAT_PGSZ as u64;
7255
/// Lower/user top VA
@@ -86,8 +69,6 @@ const IOVA_KERN_RANGE: Range<u64> = IOVA_KERN_BASE..IOVA_KERN_TOP;
8669
const TTBR_VALID: u64 = 0x1; // BIT(0)
8770
const TTBR_ASID_SHIFT: usize = 48;
8871

89-
const PTE_TABLE: u64 = 0x3; // BIT(0) | BIT(1)
90-
9172
/// Address of a special dummy page?
9273
//const IOVA_UNK_PAGE: u64 = 0x6f_ffff8000;
9374
pub(crate) const IOVA_UNK_PAGE: u64 = IOVA_USER_TOP - 2 * UAT_PGSZ as u64;

0 commit comments

Comments
 (0)