Linux-RISC-V Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE
@ 2019-11-08  9:00 Zong Li
  2019-11-11  9:55 ` Christoph Hellwig
  2019-11-12 20:03 ` Paul Walmsley
  0 siblings, 2 replies; 3+ messages in thread
From: Zong Li @ 2019-11-08  9:00 UTC (permalink / raw)
  To: linux-kernel, linux-riscv, paul.walmsley, palmer, anup, hch; +Cc: Zong Li

The PMD_SIZE is equal to PGDIR_SIZE when __PAGETABLE_PMD_FOLDED is
defined.

Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>

---
 arch/riscv/mm/init.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 573463d..e83df7a 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -273,7 +273,6 @@ static void __init create_pmd_mapping(pmd_t *pmdp,
 #define get_pgd_next_virt(__pa)	get_pmd_virt(__pa)
 #define create_pgd_next_mapping(__nextp, __va, __pa, __sz, __prot)	\
 	create_pmd_mapping(__nextp, __va, __pa, __sz, __prot)
-#define PTE_PARENT_SIZE		PMD_SIZE
 #define fixmap_pgd_next		fixmap_pmd
 #else
 #define pgd_next_t		pte_t
@@ -281,7 +280,6 @@ static void __init create_pmd_mapping(pmd_t *pmdp,
 #define get_pgd_next_virt(__pa)	get_pte_virt(__pa)
 #define create_pgd_next_mapping(__nextp, __va, __pa, __sz, __prot)	\
 	create_pte_mapping(__nextp, __va, __pa, __sz, __prot)
-#define PTE_PARENT_SIZE		PGDIR_SIZE
 #define fixmap_pgd_next		fixmap_pte
 #endif
 
@@ -314,14 +312,11 @@ static void __init create_pgd_mapping(pgd_t *pgdp,
 
 static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
 {
-	uintptr_t map_size = PAGE_SIZE;
+	/* Upgrade to PMD_SIZE mappings whenever possible */
+	if ((base & (PMD_SIZE - 1)) || (size & (PMD_SIZE - 1)))
+		return PAGE_SIZE;
 
-	/* Upgrade to PMD/PGDIR mappings whenever possible */
-	if (!(base & (PTE_PARENT_SIZE - 1)) &&
-	    !(size & (PTE_PARENT_SIZE - 1)))
-		map_size = PTE_PARENT_SIZE;
-
-	return map_size;
+	return PMD_SIZE;
 }
 
 /*
-- 
2.7.4


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE
  2019-11-08  9:00 [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE Zong Li
@ 2019-11-11  9:55 ` Christoph Hellwig
  2019-11-12 20:03 ` Paul Walmsley
  1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2019-11-11  9:55 UTC (permalink / raw)
  To: Zong Li; +Cc: anup, linux-kernel, hch, palmer, paul.walmsley, linux-riscv

On Fri, Nov 08, 2019 at 01:00:40AM -0800, Zong Li wrote:
> The PMD_SIZE is equal to PGDIR_SIZE when __PAGETABLE_PMD_FOLDED is
> defined.

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE
  2019-11-08  9:00 [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE Zong Li
  2019-11-11  9:55 ` Christoph Hellwig
@ 2019-11-12 20:03 ` Paul Walmsley
  1 sibling, 0 replies; 3+ messages in thread
From: Paul Walmsley @ 2019-11-12 20:03 UTC (permalink / raw)
  To: Zong Li; +Cc: hch, anup, linux-riscv, palmer, linux-kernel

On Fri, 8 Nov 2019, Zong Li wrote:

> The PMD_SIZE is equal to PGDIR_SIZE when __PAGETABLE_PMD_FOLDED is
> defined.
> 
> Signed-off-by: Zong Li <zong.li@sifive.com>
> Reviewed-by: Anup Patel <anup@brainfault.org>

Thanks, dropped v2 and queued this v3 with Christoph's Ack.


- Paul

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-08  9:00 [PATCH v3] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE Zong Li
2019-11-11  9:55 ` Christoph Hellwig
2019-11-12 20:03 ` Paul Walmsley

Linux-RISC-V Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-riscv/0 linux-riscv/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-riscv linux-riscv/ https://lore.kernel.org/linux-riscv \
		linux-riscv@lists.infradead.org
	public-inbox-index linux-riscv

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-riscv


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git