mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stafford Horne <shorne@gmail.com>
To: stefan.kristiansson@saunalahti.fi, shorne@gmail.com, jonas@southpole.se
Cc: linux@roeck-us.net, blue@cmd.nu, robh@kernel.org,
	linux-kernel@vger.kernel.org, openrisc@lists.librecores.org
Subject: [PATCH v2 1/9] openrisc: fix PTRS_PER_PGD define
Date: Mon, 14 Nov 2016 22:30:31 +0900	[thread overview]
Message-ID: <80c23bdfab23b1939c3ab8e382d4cdb251a732e1.1479128947.git.shorne@gmail.com> (raw)
In-Reply-To: <1479130239-30707-1-git-send-email-shorne@gmail.com>
In-Reply-To: <cover.1479128947.git.shorne@gmail.com>

From: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>

On OpenRISC, with its 8k pages, PAGE_SHIFT is defined to be 13.
That makes the expression (1UL << (PAGE_SHIFT-2)) evaluate
to 2048.
The correct value for PTRS_PER_PGD should be 256.

Correcting the PTRS_PER_PGD define unveiled a bug in map_ram(),
where PTRS_PER_PGD was used when the intent was to iterate
over a set of page table entries.
This patch corrects that issue as well.

Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Signed-off-by: Stafford Horne <shorne@gmail.com>
Acked-by: Jonas Bonn <jonas@southpole.se>
Tested-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/openrisc/include/asm/pgtable.h | 2 +-
 arch/openrisc/mm/init.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h
index 69c7df0..3567aa7 100644
--- a/arch/openrisc/include/asm/pgtable.h
+++ b/arch/openrisc/include/asm/pgtable.h
@@ -69,7 +69,7 @@ extern void paging_init(void);
  */
 #define PTRS_PER_PTE	(1UL << (PAGE_SHIFT-2))
 
-#define PTRS_PER_PGD	(1UL << (PAGE_SHIFT-2))
+#define PTRS_PER_PGD	(1UL << (32-PGDIR_SHIFT))
 
 /* calculate how many PGD entries a user-level program can use
  * the first mappable virtual address is 0
diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index 7f94652..b782ce9 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
@@ -110,7 +110,7 @@ static void __init map_ram(void)
 			set_pmd(pme, __pmd(_KERNPG_TABLE + __pa(pte)));
 
 			/* Fill the newly allocated page with PTE'S */
-			for (j = 0; p < e && j < PTRS_PER_PGD;
+			for (j = 0; p < e && j < PTRS_PER_PTE;
 			     v += PAGE_SIZE, p += PAGE_SIZE, j++, pte++) {
 				if (v >= (u32) _e_kernel_ro ||
 				    v < (u32) _s_kernel_ro)
-- 
2.7.4

  parent reply	other threads:[~2016-11-14 13:35 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-14 13:30 [PATCH v2 0/9] openrisc: Misc fixes from backlog Stafford Horne
     [not found] ` <cover.1479128947.git.shorne@gmail.com>
2016-11-14 13:30   ` Stafford Horne [this message]
2016-11-14 13:30   ` [PATCH v2 2/9] openrisc: restore all regs on rt_sigreturn Stafford Horne
2016-11-14 13:30   ` [PATCH v2 3/9] openrisc: Add thread-local storage (TLS) support Stafford Horne
2016-11-14 13:30   ` [PATCH v2 4/9] openrisc: Support both old (or32) and new (or1k) toolchain Stafford Horne
2016-11-14 13:30   ` [PATCH v2 5/9] openrisc: add NR_CPUS Kconfig default value Stafford Horne
2016-11-14 13:30   ` [PATCH v2 6/9] openrisc: remove the redundant of_platform_populate Stafford Horne
2016-11-14 13:30   ` [PATCH v2 7/9] openrisc: Consolidate setup to use memblock instead of bootmem Stafford Horne
2016-11-14 13:30   ` [PATCH v2 8/9] openrisc: Updates after openrisc.net has been lost Stafford Horne
2016-11-16  7:13     ` [OpenRISC] " Olof Kindgren
2016-12-14  8:57     ` Geert Uytterhoeven
2016-12-14 11:44       ` Stafford Horne
2016-11-14 13:30   ` [PATCH v2 9/9] openrisc: include l.swa in check for write data pagefault Stafford Horne
2016-11-30  1:23 ` [PATCH v2 0/9] openrisc: Misc fixes from backlog Guenter Roeck
2016-11-30 12:40   ` Stafford Horne
2016-11-30 14:21     ` Guenter Roeck

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=80c23bdfab23b1939c3ab8e382d4cdb251a732e1.1479128947.git.shorne@gmail.com \
    --to=shorne@gmail.com \
    --cc=blue@cmd.nu \
    --cc=jonas@southpole.se \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=openrisc@lists.librecores.org \
    --cc=robh@kernel.org \
    --cc=stefan.kristiansson@saunalahti.fi \
    /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

all inboxes | Powered by JetHome®