Skip to contentSkip to conversation

KVM: arm64: Drop PTE_S2_MEMATTR_MASK

PATCH Applied Zenghui Yu 3 participants 5 messages Apr 15, 2020 – Apr 28, 2020

Subsystems (2)
lore
Share & tools
lore

Zenghui Yu

author reviewer
#0 lore raw

PATCH 1/1 KVM: arm64: Drop PTE_S2_MEMATTR_MASK

The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again.

Let's drop it.

---
 arch/arm64/include/asm/pgtable-hwdef.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/pgtable-hwdef.h +0 -1
index 6bf5e650da78..99315bdca0e6 100644
@@ -190,7 +190,6 @@
  * Memory Attribute override for Stage-2 (MemAttr[3:0])
  */
 #define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)
-#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)
 
 /*
  * EL2/HYP PTE/PMD definitions
Signature · 7 lines
2.19.1


_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · On Wed, 15 Apr 2020 18:57:46 +0800 Zenghui Yu <[email protected]> wrote:

The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again.

Let's drop it.

---
 arch/arm64/include/asm/pgtable-hwdef.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/pgtable-hwdef.h +0 -0
index 6bf5e650da78..99315bdca0e6 100644

arch/arm64/include/asm/pgtable-hwdef.h line 195

Quoted 7 lines
arch/arm64/include/asm/pgtable-hwdef.h +0 -1
@@ -190,7 +190,6 @@
  * Memory Attribute override for Stage-2 (MemAttr[3:0])
  */
 #define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)
-#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)
 
 /*
  * EL2/HYP PTE/PMD definitions

Looks good to me. Catalin, Will: do you want to take this directly? If so please add my:

Otherwise, I'll route it via the KVM tree.

Thanks,

	M.
Signature · 6 lines
Jazz is not dead. It just smells funny...

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#2 lore raw
Quoted 30 lines · Marc Zyngier
Quoted 16 lines · On Wed, 15 Apr 2020 18:57:46 +0800 Zenghui Yu <[email protected]> wrote:

The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again.

Let's drop it.

---
 arch/arm64/include/asm/pgtable-hwdef.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/pgtable-hwdef.h +0 -0
index 6bf5e650da78..99315bdca0e6 100644

arch/arm64/include/asm/pgtable-hwdef.h line 195

Quoted 7 lines
arch/arm64/include/asm/pgtable-hwdef.h +0 -1
@@ -190,7 +190,6 @@
  * Memory Attribute override for Stage-2 (MemAttr[3:0])
  */
 #define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)
-#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)
 
 /*
  * EL2/HYP PTE/PMD definitions

Looks good to me. Catalin, Will: do you want to take this directly? If so please add my:

Quoted 3 lines

Otherwise, I'll route it via the KVM tree.

I can take it for 5.8 if it's not urgent.

Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

maintainer
#3 lore raw
Quoted 31 lines · Will Deacon
Quoted 30 lines · Marc Zyngier
Quoted 16 lines · On Wed, 15 Apr 2020 18:57:46 +0800 Zenghui Yu <[email protected]> wrote:

The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again.

Let's drop it.

---
 arch/arm64/include/asm/pgtable-hwdef.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/pgtable-hwdef.h +0 -0
index 6bf5e650da78..99315bdca0e6 100644

arch/arm64/include/asm/pgtable-hwdef.h line 195

Quoted 7 lines
arch/arm64/include/asm/pgtable-hwdef.h +0 -1
@@ -190,7 +190,6 @@
  * Memory Attribute override for Stage-2 (MemAttr[3:0])
  */
 #define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)
-#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)
 
 /*
  * EL2/HYP PTE/PMD definitions

Looks good to me. Catalin, Will: do you want to take this directly? If so please add my:

Quoted 5 lines
Quoted 3 lines

Otherwise, I'll route it via the KVM tree.

I can take it for 5.8 if it's not urgent.

It has been there 6 years, I think we can cope with another few months... ;-)

Thanks,

        M.
Signature · 6 lines
Jazz is not dead. It just smells funny...

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Applied
#4 lore raw
In reply to Zenghui Yu
Quoted 5 lines · Zenghui Yu

The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again.

Let's drop it.

Applied to arm64 (for-next/misc), thanks!

[1/1] KVM: arm64: Drop PTE_S2_MEMATTR_MASK

      https://git.kernel.org/arm64/c/f4be140fa33f

Cheers,

Signature · 8 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm