Skip to contentSkip to conversation

riscv: Move nommu pgprot_* macros to pgtable.h

PATCH RESEND In review Pekka Enberg 2 participants 3 messages Jun 30, 2020 – Jul 14, 2020 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 riscv: Move nommu pgprot_* macros to pgtable.h

From: Pekka Enberg <[email protected]>

The mmio.h header file defines some pgprot macros for !CONFIG_MMU, but pgtable.h seems like a better place for them.

Compile tested with defconfig + !CONFIG_MMU.

---
Although the patche appeard on the mailing list, they never made it to the inbox of some important folks such as maintainers... I assume the reason is that "git-send-email" used "[email protected]" in the email headers when it really was sent from "[email protected]".

 arch/riscv/include/asm/mmio.h    | 6 ------
 arch/riscv/include/asm/pgtable.h | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)
arch/riscv/include/asm/mmio.h +0 -6
index 56053c9838b2..aff6c33ab0c0 100644
@@ -14,12 +14,6 @@
 #include <linux/types.h>
 #include <asm/mmiowb.h>
 
-#ifndef CONFIG_MMU
-#define pgprot_noncached(x)	(x)
-#define pgprot_writecombine(x)	(x)
-#define pgprot_device(x)	(x)
-#endif /* CONFIG_MMU */
-
 /* Generic IO read/write.  These perform native-endian accesses. */
 #define __raw_writeb __raw_writeb
 static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
arch/riscv/include/asm/pgtable.h +4 -0
index eaea1f717010..e82a32112b7e 100644
@@ -459,6 +459,10 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
 
 static inline void __kernel_map_pages(struct page *page, int numpages, int enable) {}
 
+#define pgprot_noncached(x)	(x)
+#define pgprot_writecombine(x)	(x)
+#define pgprot_device(x)	(x)
+
 #endif /* !CONFIG_MMU */
 
 #define kern_addr_valid(addr)   (1) /* FIXME */
Signature · 7 lines
2.25.0


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
maintainer
#1 lore raw
Quoted 41 lines · On Mon, 29 Jun 2020 23:28:28 PDT (-0700), [email protected] wrote:

From: Pekka Enberg <[email protected]>

The mmio.h header file defines some pgprot macros for !CONFIG_MMU, but pgtable.h seems like a better place for them.

Compile tested with defconfig + !CONFIG_MMU.

---
Although the patche appeard on the mailing list, they never made it to the inbox of some important folks such as maintainers... I assume the reason is that "git-send-email" used "[email protected]" in the email headers when it really was sent from "[email protected]".

 arch/riscv/include/asm/mmio.h    | 6 ------
 arch/riscv/include/asm/pgtable.h | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)
arch/riscv/include/asm/mmio.h +0 -6
index 56053c9838b2..aff6c33ab0c0 100644
@@ -14,12 +14,6 @@
 #include <linux/types.h>
 #include <asm/mmiowb.h>
 
-#ifndef CONFIG_MMU
-#define pgprot_noncached(x)	(x)
-#define pgprot_writecombine(x)	(x)
-#define pgprot_device(x)	(x)
-#endif /* CONFIG_MMU */
-
 /* Generic IO read/write.  These perform native-endian accesses. */
 #define __raw_writeb __raw_writeb
 static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
arch/riscv/include/asm/pgtable.h +0 -0
index eaea1f717010..e82a32112b7e 100644

arch/riscv/include/asm/pgtable.h static inline int ptep_clear_flush_young(struct vm_area_struct *vma, · line 468

Quoted 10 lines
arch/riscv/include/asm/pgtable.h +4 -0
@@ -459,6 +459,10 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
 
 static inline void __kernel_map_pages(struct page *page, int numpages, int enable) {}
 
+#define pgprot_noncached(x)	(x)
+#define pgprot_writecombine(x)	(x)
+#define pgprot_device(x)	(x)
+
 #endif /* !CONFIG_MMU */
 
 #define kern_addr_valid(addr)   (1) /* FIXME */

This seems fine, but I guess I don't understand why they don't have default values in the generic code for !MMU. It kind of seems like it's an oversight due to nested #ifdefs. Assuming that's the case, we can just juggle those around and then remove these from all the ports that define the now useless macros.

LMK if you want to pursue that or if you want me to take it over.

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#2 lore raw

Hi Palmer,

Quoted 7 lines · Palmer Dabbelt

This seems fine, but I guess I don't understand why they don't have default values in the generic code for !MMU. It kind of seems like it's an oversight due to nested #ifdefs. Assuming that's the case, we can just juggle those around and then remove these from all the ports that define the now useless macros.

LMK if you want to pursue that or if you want me to take it over.

Yeah, makes sense, I'll send patches to do that instead. Thanks!

- Pekka

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv