From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
To: "christophe.leroy@c-s.fr" <christophe.leroy@c-s.fr>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"paulus@samba.org" <paulus@samba.org>,
"scottwood@freescale.com" <scottwood@freescale.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH 04/11] powerpc/8xx: Take benefit of aligned PGDIR
Date: Mon, 5 Jan 2015 18:19:13 +0000 [thread overview]
Message-ID: <1420481953.25047.19.camel@transmode.se> (raw)
In-Reply-To: <20141216150338.978F71A5E04@localhost.localdomain>
On Tue, 2014-12-16 at 16:03 +0100, Christophe Leroy wrote:
> L1 base address is now aligned so we can insert L1 index into r11 directl=
y and
> then preserve r10
>=20
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>
>=20
> ---
> arch/powerpc/kernel/head_8xx.S | 34 +++++++++++++++-------------------
> 1 file changed, 15 insertions(+), 19 deletions(-)
>=20
> diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8x=
x.S
> index 2c329f1..ae05f28 100644
> --- a/arch/powerpc/kernel/head_8xx.S
> +++ b/arch/powerpc/kernel/head_8xx.S
> @@ -326,16 +326,15 @@ InstructionTLBMiss:
> ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
> 3:
> #endif
> - /* Extract level 1 index */
> - rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> - lwzx r11, r10, r11/* Get the level 1 entry */
> - rlwinm r10, r11,0,0,19/* Extract page descriptor page address */
> + /* Insert level 1 index */
> + rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> + lwz r11, 0(r11)/* Get the level 1 entry */
> =20
> /* Load the MI_TWC with the attributes for this "segment." */
> MTSPR_CPU6(SPRN_MI_TWC, r11, r3)/* Set segment attributes */
> - mfspr r11, SPRN_SRR0/* Get effective address of fault */
> + rlwinm r11, r11,0,0,19/* Extract page descriptor page address */
> /* Extract level 2 index */
> - rlwinm r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
> + rlwinm r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
> lwzx r10, r10, r11/* Get the pte */
> =20
> #ifdef CONFIG_SWAP
> @@ -380,13 +379,12 @@ DataStoreTLBMiss:
> lis r11, (swapper_pg_dir-PAGE_OFFSET)@h
> ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
> 3:
> - /* Extract level 1 index */
> - rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> - lwzx r11, r10, r11/* Get the level 1 entry */
> + /* Insert level 1 index */
> + rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> + lwz r11, 0(r11)/* Get the level 1 entry */
> =20
> /* We have a pte table, so load fetch the pte from the table.
> */
> - mfspr r10, SPRN_MD_EPN/* Get address of fault */
> /* Extract level 2 index */
> rlwinm r10, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
> rlwimi r10, r11, 0, 0, 32 - PAGE_SHIFT - 1/* Add level 2 base */
> @@ -515,16 +513,14 @@ FixupDAR:/* Entry point for dcbx workaround. */
> beq- 3f /* Branch if user space */
> lis r11, (swapper_pg_dir-PAGE_OFFSET)@h
> ori r11, r11, (swapper_pg_dir-PAGE_OFFSET)@l
> - /* Extract level 1 index */
> -3: rlwinm r10, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> - lwzx r11, r10, r11/* Get the level 1 entry */
> - rlwinm r10, r11,0,0,19/* Extract page descriptor page address */
> - mfspr r11, SPRN_SRR0/* Get effective address of fault */
> - /* Extract level 2 index */
> - rlwinm r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
> - lwzx r11, r10, r11/* Get the pte */
> + /* Insert level 1 index */
> +3: rlwimi r11, r10, 32 - ((PAGE_SHIFT - 2) << 1), (PAGE_SHIFT - 2) =
<< 1, 29
> + lwz r11, 0(r11)/* Get the level 1 entry */
> + rlwinm r11, r11,0,0,19/* Extract page descriptor page address */
> + /* Insert level 2 index */
> + rlwimi r11, r10, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
> + lwz r11, 0(r11)/* Get the pte */
> /* concat physical page address(r11) and page offset(r10) */
> - mfspr r10, SPRN_SRR0
> rlwimi r11, r10, 0, 32 - PAGE_SHIFT, 31
> lwz r11,0(r11)
> /* Check if it really is a dcbx instruction. */=
next prev parent reply other threads:[~2015-01-05 18:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-16 15:03 [PATCH 04/11] powerpc/8xx: Take benefit of aligned PGDIR Christophe Leroy
2015-01-05 18:19 ` Joakim Tjernlund [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-20 5:26 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=1420481953.25047.19.camel@transmode.se \
--to=joakim.tjernlund@transmode.se \
--cc=christophe.leroy@c-s.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=scottwood@freescale.com \
/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;
as well as URLs for NNTP newsgroup(s).