All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	j.neuschaefer@gmx.net
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v1 06/13] powerpc/mm/32s: use _PAGE_EXEC in setbat()
Date: Thu, 29 Nov 2018 19:00:22 +0000 (UTC)	[thread overview]
Message-ID: <4f49328bc6c1dd35b1af638aa8ffb17c668d026e.1543517818.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1543517818.git.christophe.leroy@c-s.fr>

Do not set IBAT when setbat() is called without _PAGE_EXEC

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/mm/ppc_mmu_32.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index 61c10ee00ba2..1078095d9407 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -130,6 +130,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)
  * Set up one of the I/D BAT (block address translation) register pairs.
  * The parameters are not checked; in particular size must be a power
  * of 2 between 128k and 256M.
+ * On 603+, only set IBAT when _PAGE_EXEC is set
  */
 void __init setbat(int index, unsigned long virt, phys_addr_t phys,
 		   unsigned int size, pgprot_t prot)
@@ -156,11 +157,12 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
 			bat[1].batu |= 1; 	/* Vp = 1 */
 		if (flags & _PAGE_GUARDED) {
 			/* G bit must be zero in IBATs */
-			bat[0].batu = bat[0].batl = 0;
-		} else {
-			/* make IBAT same as DBAT */
-			bat[0] = bat[1];
+			flags &= ~_PAGE_EXEC;
 		}
+		if (flags & _PAGE_EXEC)
+			bat[0] = bat[1];
+		else
+			bat[0].batu = bat[0].batl = 0;
 	} else {
 		/* 601 cpu */
 		if (bl > BL_8M)
-- 
2.13.3


WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	 j.neuschaefer@gmx.net
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 06/13] powerpc/mm/32s: use _PAGE_EXEC in setbat()
Date: Thu, 29 Nov 2018 19:00:22 +0000 (UTC)	[thread overview]
Message-ID: <4f49328bc6c1dd35b1af638aa8ffb17c668d026e.1543517818.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1543517818.git.christophe.leroy@c-s.fr>

Do not set IBAT when setbat() is called without _PAGE_EXEC

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/mm/ppc_mmu_32.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index 61c10ee00ba2..1078095d9407 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -130,6 +130,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)
  * Set up one of the I/D BAT (block address translation) register pairs.
  * The parameters are not checked; in particular size must be a power
  * of 2 between 128k and 256M.
+ * On 603+, only set IBAT when _PAGE_EXEC is set
  */
 void __init setbat(int index, unsigned long virt, phys_addr_t phys,
 		   unsigned int size, pgprot_t prot)
@@ -156,11 +157,12 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
 			bat[1].batu |= 1; 	/* Vp = 1 */
 		if (flags & _PAGE_GUARDED) {
 			/* G bit must be zero in IBATs */
-			bat[0].batu = bat[0].batl = 0;
-		} else {
-			/* make IBAT same as DBAT */
-			bat[0] = bat[1];
+			flags &= ~_PAGE_EXEC;
 		}
+		if (flags & _PAGE_EXEC)
+			bat[0] = bat[1];
+		else
+			bat[0].batu = bat[0].batl = 0;
 	} else {
 		/* 601 cpu */
 		if (bl > BL_8M)
-- 
2.13.3


  parent reply	other threads:[~2018-11-29 19:00 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-29 19:00 [PATCH v1 00/13] powerpc/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2018-11-29 19:00 ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 01/13] powerpc/mm: add exec protection on powerpc 603 Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 02/13] powerpc/mm/32: add base address to mmu_mapin_ram() Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 03/13] powerpc/mm/32s: rework mmu_mapin_ram() Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-12-03 21:55   ` Jonathan Neuschäfer
2018-12-03 21:55     ` Jonathan Neuschäfer
2018-12-13 12:16     ` Christophe Leroy
2018-12-13 12:16       ` Christophe Leroy
2018-12-13 14:51       ` Christophe Leroy
2018-12-13 14:51         ` Christophe Leroy
2018-12-17  1:28         ` Jonathan Neuschäfer
2018-12-17  1:28           ` Jonathan Neuschäfer
2018-12-17  9:29           ` Christophe Leroy
2018-12-17  9:29             ` Christophe Leroy
2018-12-18  3:05             ` Jonathan Neuschäfer
2018-12-18  3:05               ` Jonathan Neuschäfer
2018-12-18  9:18               ` Christophe Leroy
2018-12-18  9:18                 ` Christophe Leroy
2018-12-18 14:07                 ` Jonathan Neuschäfer
2018-12-18 14:07                   ` Jonathan Neuschäfer
2018-12-18 14:15                   ` Christophe Leroy
2018-12-18 14:15                     ` Christophe Leroy
2018-12-18 14:55                     ` Christophe Leroy
2018-12-18 14:55                       ` Christophe Leroy
2018-12-18 15:04                       ` Christophe Leroy
2018-12-18 15:04                         ` Christophe Leroy
2018-12-18 17:04                         ` Jonathan Neuschäfer
2018-12-18 17:04                           ` Jonathan Neuschäfer
2018-12-18 18:13                           ` Christophe Leroy
2018-12-18 18:13                             ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 04/13] powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 05/13] powerpc/wii: remove wii_mmu_mapin_mem2() Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` Christophe Leroy [this message]
2018-11-29 19:00   ` [PATCH v1 06/13] powerpc/mm/32s: use _PAGE_EXEC in setbat() Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 07/13] powerpc/mm/32s: add setibat() clearibat() and update_bats() Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 08/13] powerpc/32: add helper to write into segment registers Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 09/13] powerpc/mmu: add is_strict_kernel_rwx() helper Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 10/13] powerpc/kconfig: define PAGE_SHIFT inside Kconfig Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 11/13] powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 12/13] powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy
2018-11-29 19:00 ` [PATCH v1 13/13] powerpc/kconfig: make _etext and data areas alignment configurable on Book3s 32 Christophe Leroy
2018-11-29 19:00   ` Christophe Leroy

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=4f49328bc6c1dd35b1af638aa8ffb17c668d026e.1543517818.git.christophe.leroy@c-s.fr \
    --to=christophe.leroy@c-s.fr \
    --cc=benh@kernel.crashing.org \
    --cc=j.neuschaefer@gmx.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.