From: "Sachin P. Sant" <sachinp@in•ibm.com>
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Cc: linuxppc-dev@ozlabs•org, Paul Mackerras <paulus@samba•org>,
kexec@lists•infradead.org
Subject: Re: [Patch ] Kexec/Kdump support - POWER6
Date: Tue, 29 May 2007 11:48:09 +0530 [thread overview]
Message-ID: <465BC5A1.5040505@in.ibm.com> (raw)
In-Reply-To: <1180387894.19517.99.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
Benjamin Herrenschmidt wrote:
> Move those to mmu-hash64.h along with the other ones. Also, keep the
> mask aligned to the top bits
>
In previous patches i had these #defines in mmu-hash64.h. But got
review comments to move them to lpar.c :-)
Oh well i will move them back to mmu-hash64.h.
>> + if (!lpar_rc && (((dword0 >> 24) & HPTE_V_VRMA_MASK)
>>
> No need to shift >> 24, just have the mask left justified in the first
> place. No need to have a "magic" shift value in there.
>
Ok.
> Appart from that, looks good. Does it actually work ? :-)
>
Yes it does work. It must be my lucky day when i coded the patch :-)
Thanks
-Sachin
Signed-off-by : Sachin Sant <sachinp@in•ibm.com>
Signed-off-by : Mohan Kumar M <mohan@in•ibm.com>
---
[-- Attachment #2: kexec-kdump-support-on-POWER6 --]
[-- Type: text/plain, Size: 3012 bytes --]
* On Power machines supporting VRMA, Kexec/Kdump does not work.
* Hypervisor stores VRMA mapping used by the OS, in the hpte hash tables.
* Make sure these hpte entries are left untouched.
*
* This patch also adds plpar_pte_read_raw() on the lines of
* plpar_pte_remove_raw().
Signed-off-by : Sachin Sant <sachinp@in•ibm.com>
Signed-off-by : Mohan Kumar M <mohan@in•ibm.com>
---
diff -Naurp a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
--- a/arch/powerpc/platforms/pseries/lpar.c 2007-05-19 09:36:17.000000000 +0530
+++ b/arch/powerpc/platforms/pseries/lpar.c 2007-05-29 10:45:34.000000000 +0530
@@ -373,12 +373,23 @@ static void pSeries_lpar_hptab_clear(voi
{
unsigned long size_bytes = 1UL << ppc64_pft_size;
unsigned long hpte_count = size_bytes >> 4;
- unsigned long dummy1, dummy2;
+ unsigned long dummy1, dummy2, dword0;
+ long lpar_rc;
int i;
/* TODO: Use bulk call */
- for (i = 0; i < hpte_count; i++)
- plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+ for (i = 0; i < hpte_count; i++) {
+ /* dont remove HPTEs with VRMA mappings */
+ lpar_rc = plpar_pte_remove_raw(H_ANDCOND, i, HPTE_V_1TB_SEG,
+ &dummy1, &dummy2);
+ if (lpar_rc == H_NOT_FOUND) {
+ lpar_rc = plpar_pte_read_raw(0, i, &dword0, &dummy1);
+ if (!lpar_rc && ((dword0 & HPTE_V_VRMA_MASK)
+ != HPTE_V_VRMA_MASK))
+ /* Can be hpte for 1TB Seg. So remove it */
+ plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+ }
+ }
}
/*
diff -Naurp a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h 2007-05-19 09:36:17.000000000 +0530
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h 2007-05-25 12:20:38.000000000 +0530
@@ -108,6 +108,21 @@ static inline long plpar_pte_read(unsign
return rc;
}
+/* plpar_pte_read_raw can be called in real mode. It calls plpar_hcall_raw */
+static inline long plpar_pte_read_raw(unsigned long flags, unsigned long ptex,
+ unsigned long *old_pteh_ret, unsigned long *old_ptel_ret)
+{
+ long rc;
+ unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+
+ rc = plpar_hcall_raw(H_READ, retbuf, flags, ptex);
+
+ *old_pteh_ret = retbuf[0];
+ *old_ptel_ret = retbuf[1];
+
+ return rc;
+}
+
static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
unsigned long avpn)
{
diff -Naurp a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h
--- a/include/asm-powerpc/mmu-hash64.h 2007-05-19 09:36:17.000000000 +0530
+++ b/include/asm-powerpc/mmu-hash64.h 2007-05-29 10:46:22.000000000 +0530
@@ -94,6 +94,9 @@ extern char initial_stab[];
#define HPTE_R_C ASM_CONST(0x0000000000000080)
#define HPTE_R_R ASM_CONST(0x0000000000000100)
+#define HPTE_V_1TB_SEG ASM_CONST(0x4000000000000000)
+#define HPTE_V_VRMA_MASK ASM_CONST(0x4001ffffff000000)
+
/* Values for PP (assumes Ks=0, Kp=1) */
/* pp0 will always be 0 for linux */
#define PP_RWXX 0 /* Supervisor read/write, User none */
next prev parent reply other threads:[~2007-05-29 6:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-22 12:22 [Patch 0/2] Kexec/Kdump support POWER6 Sachin P. Sant
2007-05-22 12:24 ` [Patch 1/2] " Sachin P. Sant
2007-05-22 12:26 ` [Patch 2/2] " Sachin P. Sant
2007-05-22 15:34 ` Olof Johansson
2007-05-23 5:13 ` Sachin P. Sant
2007-05-23 5:14 ` Sachin P. Sant
2007-05-23 9:37 ` [Patch 2/2] Kexec/Kdump support - POWER6 Sachin P. Sant
2007-05-23 10:55 ` Paul Mackerras
2007-05-24 12:17 ` Mohan Kumar M
2007-05-24 14:21 ` Olof Johansson
2007-05-25 8:55 ` [Patch ] " Sachin P. Sant
2007-05-25 22:43 ` Benjamin Herrenschmidt
2007-05-28 11:40 ` Sachin P. Sant
2007-05-28 21:31 ` Benjamin Herrenschmidt
2007-05-29 6:18 ` Sachin P. Sant [this message]
2007-05-29 6:58 ` Benjamin Herrenschmidt
2007-05-29 10:14 ` Michael Ellerman
2007-05-29 11:06 ` Stephen Rothwell
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=465BC5A1.5040505@in.ibm.com \
--to=sachinp@in$(echo .)ibm.com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=kexec@lists$(echo .)infradead.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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