2:43 a.m.
The following series implements :
* An infrastructure for platform based vmalloc translation for PPC32
* vmalloc translation support for PPC440
We maintain a list of platforms with the relevant definitions for Virtual
Address translation bits. Based on the 'powerpc_base_platform' kernel global
variable, we could dynamically find the platform the core was generated
for and match it to the definitions.
---
Suzuki K. Poulose (3):
[ppc] virtual address translation bits for PPC440
[ppc] Support for platform based Virtual address translation
[ppc] Non-linear address translation routine
defs.h | 19 ++++-
ppc.c | 264 +++++++++++++++++++++++++++++++++++-----------------------------
2 files changed, 160 insertions(+), 123 deletions(-)
--
Suzuki K. Poulose
2:43 a.m.
New subject: [PATCH v2 1/3] [ppc] Non-linear address translation routine
This patch moves the common code for traversing through the PGD, PTE
tables in userspace virtual address translation and vmalloc address translation
to a new routine. This will help us to make changes to the common code
at a single place. This will be used for board based definitions for address
translation
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
ppc.c | 184 +++++++++++++++++++++++------------------------------------------
1 files changed, 65 insertions(+), 119 deletions(-)
diff --git a/ppc.c b/ppc.c
index 9e704d0..cfa3f5f 100755
--- a/ppc.c
+++ b/ppc.c
@@ -262,6 +262,69 @@ ppc_dump_machdep_table(ulong arg)
fprintf(fp, " machspec: %lx\n", (ulong)machdep->machspec);
}
+static int
+ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int verbose)
+{
+ ulong *page_dir;
+ ulong *page_middle;
+ ulong *page_table;
+ ulong pgd_pte;
+ ulong pte;
+
+ if (verbose)
+ fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
+
+ page_dir = pgd + (vaddr >> PGDIR_SHIFT);
+
+ FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
+ pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
+
+ if (verbose)
+ fprintf(fp, " PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
+
+ if (!pgd_pte)
+ goto no_page;
+
+ page_middle = (ulong *)pgd_pte;
+
+ if (machdep->flags & CPU_BOOKE)
+ page_table = page_middle + (BTOP(vaddr) & (PTRS_PER_PTE - 1));
+ else {
+ page_table = (ulong *)((pgd_pte & (ulong)machdep->pagemask) +
machdep->kvbase);
+ page_table += ((ulong)BTOP(vaddr) & (PTRS_PER_PTE-1));
+ }
+
+ if (verbose)
+ fprintf(fp, " PMD: %lx => %lx\n", (ulong)page_middle,
+ (ulong)page_table);
+
+ FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
+ pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
+
+ if (verbose)
+ fprintf(fp, " PTE: %lx => %lx\n", (ulong)page_table, pte);
+
+ if (!(pte & _PAGE_PRESENT)) {
+ if (pte && verbose) {
+ fprintf(fp, "\n");
+ ppc_translate_pte(pte, 0, 0);
+ }
+ goto no_page;
+ }
+
+ if (verbose) {
+ fprintf(fp, " PAGE: %lx\n\n", PAGEBASE(pte));
+ ppc_translate_pte(pte, 0, 0);
+ }
+
+ *paddr = PAGEBASE(pte) + PAGEOFFSET(vaddr);
+
+ return TRUE;
+
+no_page:
+ return FALSE;
+
+}
/*
* Translates a user virtual address to its physical address. cmd_vtop()
@@ -278,11 +341,6 @@ ppc_uvtop(struct task_context *tc, ulong vaddr, physaddr_t *paddr,
int verbose)
{
ulong mm, active_mm;
ulong *pgd;
- ulong *page_dir;
- ulong *page_middle;
- ulong *page_table;
- ulong pgd_pte;
- ulong pte;
if (!tc)
error(FATAL, "current context invalid\n");
@@ -318,62 +376,7 @@ ppc_uvtop(struct task_context *tc, ulong vaddr, physaddr_t *paddr,
int verbose)
FAULT_ON_ERROR);
}
- if (verbose)
- fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
-
- page_dir = pgd + (vaddr >> PGDIR_SHIFT);
-
- FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
- pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
-
- if (verbose)
- fprintf(fp, " PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
-
- if (!pgd_pte)
- goto no_upage;
-
- page_middle = (ulong *)pgd_pte;
-
- if (machdep->flags & CPU_BOOKE)
- page_table = page_middle + (BTOP(vaddr) & (PTRS_PER_PTE - 1));
- else {
- page_table = (ulong *)((pgd_pte & (ulong)machdep->pagemask) +
machdep->kvbase);
- page_table += ((ulong)BTOP(vaddr) & (PTRS_PER_PTE-1));
- }
-
- if (verbose)
- fprintf(fp, " PMD: %lx => %lx\n",(ulong)page_middle,
- (ulong)page_table);
-
- FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
- pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
-
- if (verbose)
- fprintf(fp, " PTE: %lx => %lx\n", (ulong)page_table, pte);
-
- if (!(pte & _PAGE_PRESENT)) {
- *paddr = pte;
- if (pte && verbose) {
- fprintf(fp, "\n");
- ppc_translate_pte(pte, 0, 0);
- }
- goto no_upage;
- }
-
- if (!pte)
- goto no_upage;
-
- *paddr = PAGEBASE(pte) + PAGEOFFSET(vaddr);
-
- if (verbose) {
- fprintf(fp, " PAGE: %lx\n\n", PAGEBASE(pte));
- ppc_translate_pte(pte, 0, 0);
- }
-
- return TRUE;
-
-no_upage:
- return FALSE;
+ return ppc_pgd_vtop(pgd, vaddr, paddr, verbose);
}
/*
@@ -385,11 +388,6 @@ static int
ppc_kvtop(struct task_context *tc, ulong kvaddr, physaddr_t *paddr, int verbose)
{
ulong *pgd;
- ulong *page_dir;
- ulong *page_middle;
- ulong *page_table;
- ulong pgd_pte;
- ulong pte;
if (!IS_KVADDR(kvaddr))
return FALSE;
@@ -406,59 +404,7 @@ ppc_kvtop(struct task_context *tc, ulong kvaddr, physaddr_t *paddr,
int verbose)
}
pgd = (ulong *)vt->kernel_pgd[0];
-
- if (verbose)
- fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
-
- page_dir = pgd + (kvaddr >> PGDIR_SHIFT);
-
- FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
- pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
-
- if (verbose)
- fprintf(fp, " PGD: %lx => %lx\n", (ulong)page_dir, pgd_pte);
-
- if (!pgd_pte)
- goto no_kpage;
-
- page_middle = (ulong *)pgd_pte;
-
- if (machdep->flags & CPU_BOOKE)
- page_table = page_middle + (BTOP(kvaddr) & (PTRS_PER_PTE - 1));
- else {
- page_table = (ulong *)((pgd_pte & (ulong)machdep->pagemask) +
machdep->kvbase);
- page_table += ((ulong)BTOP(kvaddr) & (PTRS_PER_PTE-1));
- }
-
- if (verbose)
- fprintf(fp, " PMD: %lx => %lx\n", (ulong)page_middle,
- (ulong)page_table);
-
- FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
- pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
-
- if (verbose)
- fprintf(fp, " PTE: %lx => %lx\n", (ulong)page_table, pte);
-
- if (!(pte & _PAGE_PRESENT)) {
- if (pte && verbose) {
- fprintf(fp, "\n");
- ppc_translate_pte(pte, 0, 0);
- }
- goto no_kpage;
- }
-
- if (verbose) {
- fprintf(fp, " PAGE: %lx\n\n", PAGEBASE(pte));
- ppc_translate_pte(pte, 0, 0);
- }
-
- *paddr = PAGEBASE(pte) + PAGEOFFSET(kvaddr);
-
- return TRUE;
-
-no_kpage:
- return FALSE;
+ return ppc_pgd_vtop(pgd, kvaddr, paddr, verbose);
}
/*
2:45 a.m.
New subject: [PATCH v2 2/3] [ppc] Support for platform based Virtual address translation
This patch adds infrastructure for defining Virtual address translation bits
for each platform and use the specific definition for the platform depending on
the 'powerpc_base_platform' variable. If a matching platform is not found,
fallbacks to the default definition.
Each platform can define the PGDIRSHIT, PTRS_PER_PTE and the size of a
physical address.
I have not modified the size of the machdep->pgd allocation. Instead,
we always read a PAGESIZE() which contains the entry.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
defs.h | 14 +++++++++--
ppc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/defs.h b/defs.h
index 82d51e5..aba13ea 100755
--- a/defs.h
+++ b/defs.h
@@ -2603,9 +2603,17 @@ struct load_module {
#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >=
vt->vmalloc_start)
-#define PGDIR_SHIFT (22)
-#define PTRS_PER_PTE (1024)
-#define PTRS_PER_PGD (1024)
+/* Default values for PPC */
+#define DEFAULT_PGDIR_SHIFT (22)
+#define DEFAULT_PTRS_PER_PTE (1024)
+#define DEFAULT_PTRS_PER_PGD (1024)
+#define DEFAULT_PTE_SIZE sizeof(ulong)
+
+
+#define PGDIR_SHIFT (base_platform->pgdir_shift)
+#define PTRS_PER_PTE (base_platform->ptrs_per_pte)
+#define PTRS_PER_PGD (base_platform->ptrs_per_pgd)
+#define PTE_SIZE (base_platform->pte_size)
#define _PAGE_PRESENT 0x001 /* software: pte contains a translation */
#define _PAGE_USER 0x002 /* matches one of the PP bits */
diff --git a/ppc.c b/ppc.c
index cfa3f5f..600df34 100755
--- a/ppc.c
+++ b/ppc.c
@@ -67,10 +67,59 @@ static void ppc_display_machine_stats(void);
static void ppc_dump_line_number(ulong);
static struct line_number_hook ppc_line_number_hooks[];
+struct platform {
+ char *name;
+ int pgdir_shift;
+ int ptrs_per_pgd;
+ int ptrs_per_pte;
+ int pte_size;
+} ppc_boards[] = {
+ {
+ /* Always keep the default as the first entry */
+ .name = "default",
+ .pgdir_shift = DEFAULT_PGDIR_SHIFT,
+ .ptrs_per_pgd = DEFAULT_PTRS_PER_PGD,
+ .ptrs_per_pte = DEFAULT_PTRS_PER_PTE,
+ .pte_size = DEFAULT_PTE_SIZE,
+ },
+ {
+ /* Keep this at the end */
+ .name = NULL,
+ }
+};
+
+struct platform *base_platform;
+static struct platform *ppc_get_base_platform(void);
+
/* Defined in diskdump.c */
extern void process_elf32_notes(void *, ulong);
/*
+ * Find the platform of the crashing system and set the
+ * base_platform accordingly.
+ */
+struct platform*
+ppc_get_base_platform(void)
+{
+ char platform[32];
+ struct platform *tmp = &ppc_boards[1]; /* start at 1 */
+ ulong ppc_platform;
+
+ if(!try_get_symbol_data("powerpc_base_platform", sizeof(ulong),
&ppc_platform))
+ return &ppc_boards[0];
+
+ if (read_string(ppc_platform, platform, 31) == 0)
+ return &ppc_boards[0];
+
+ for (; tmp->name!= NULL; tmp++)
+ if (!strcmp(tmp->name, platform))
+ return tmp;
+
+ /* Use default definitions */
+ return &ppc_boards[0];
+}
+
+/*
* Do all necessary machine-specific setup here. This is called twice,
* before and after GDB has been initialized.
*/
@@ -104,7 +153,6 @@ ppc_init(int when)
machdep->last_pmd_read = 0;
machdep->last_ptbl_read = 0;
machdep->verify_paddr = generic_verify_paddr;
- machdep->ptrs_per_pgd = PTRS_PER_PGD;
break;
case PRE_GDB:
@@ -130,6 +178,11 @@ ppc_init(int when)
machdep->line_number_hooks = ppc_line_number_hooks;
machdep->value_to_symbol = generic_machdep_value_to_symbol;
machdep->init_kernel_pgd = NULL;
+ /* Find the platform where we crashed */
+ base_platform = ppc_get_base_platform();
+
+ machdep->ptrs_per_pgd = PTRS_PER_PGD;
+
break;
case POST_GDB:
@@ -269,14 +322,21 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
ulong *page_middle;
ulong *page_table;
ulong pgd_pte;
- ulong pte;
+ unsigned long long pte;
- if (verbose)
+ if (verbose) {
+ fprintf(fp, "Using %s board definitions:\n", base_platform->name);
fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
+ }
page_dir = pgd + (vaddr >> PGDIR_SHIFT);
- FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
+ /*
+ * Size of a pgd could be more than a PAGE.
+ * So use PAGEBASE(page_dir), instead of
+ * PAGEBASE(pgd) for FILL_PGD()
+ */
+ FILL_PGD(PAGEBASE(page_dir), KVADDR, PAGESIZE());
pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
if (verbose)
@@ -288,10 +348,10 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
page_middle = (ulong *)pgd_pte;
if (machdep->flags & CPU_BOOKE)
- page_table = page_middle + (BTOP(vaddr) & (PTRS_PER_PTE - 1));
+ page_table = (ulong *)((ulong)page_middle + ((ulong)BTOP(vaddr) & (PTRS_PER_PTE -
1)) * PTE_SIZE);
else {
page_table = (ulong *)((pgd_pte & (ulong)machdep->pagemask) +
machdep->kvbase);
- page_table += ((ulong)BTOP(vaddr) & (PTRS_PER_PTE-1));
+ page_table = (ulong *)((ulong)page_table + ((ulong)BTOP(vaddr) & (PTRS_PER_PTE-1))
* PTE_SIZE);
}
if (verbose)
@@ -299,10 +359,14 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
(ulong)page_table);
FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
- pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
+ if (PTE_SIZE == sizeof(unsigned long long))
+ pte = ULONGLONG(machdep->ptbl + PAGEOFFSET(page_table));
+
+ else /* Defaults to ulong */
+ pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
if (verbose)
- fprintf(fp, " PTE: %lx => %lx\n", (ulong)page_table, pte);
+ fprintf(fp, " PTE: %lx => %llx\n", (ulong)page_table, pte);
if (!(pte & _PAGE_PRESENT)) {
if (pte && verbose) {
11:16 p.m.
New subject: [PATCH v2 2/3] [ppc] Support for platform based Virtual address translation
(2012/02/02 17:45), Suzuki K. Poulose wrote:
This patch adds infrastructure for defining Virtual address
translation bits
for each platform and use the specific definition for the platform depending on
the 'powerpc_base_platform' variable. If a matching platform is not found,
fallbacks to the default definition.
Each platform can define the PGDIRSHIT, PTRS_PER_PTE and the size of a
physical address.
I have not modified the size of the machdep->pgd allocation. Instead,
we always read a PAGESIZE() which contains the entry.
This way is very effectual in several angles, I like it
in addtion to your first integration work.
Signed-off-by: Suzuki K. Poulose<suzuki(a)in.ibm.com>
---
defs.h | 14 +++++++++--
ppc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/defs.h b/defs.h
index 82d51e5..aba13ea 100755
--- a/defs.h
+++ b/defs.h
@@ -2603,9 +2603,17 @@ struct load_module {
#define VTOP(X) ((unsigned long)(X)-(machdep->kvbase))
#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start&& (ulong)(X)>=
vt->vmalloc_start)
-#define PGDIR_SHIFT (22)
-#define PTRS_PER_PTE (1024)
-#define PTRS_PER_PGD (1024)
+/* Default values for PPC */
+#define DEFAULT_PGDIR_SHIFT (22)
+#define DEFAULT_PTRS_PER_PTE (1024)
+#define DEFAULT_PTRS_PER_PGD (1024)
+#define DEFAULT_PTE_SIZE sizeof(ulong)
+
+
+#define PGDIR_SHIFT (base_platform->pgdir_shift)
+#define PTRS_PER_PTE (base_platform->ptrs_per_pte)
+#define PTRS_PER_PGD (base_platform->ptrs_per_pgd)
+#define PTE_SIZE (base_platform->pte_size)
#define _PAGE_PRESENT 0x001 /* software: pte contains a translation */
#define _PAGE_USER 0x002 /* matches one of the PP bits */
diff --git a/ppc.c b/ppc.c
index cfa3f5f..600df34 100755
--- a/ppc.c
+++ b/ppc.c
@@ -67,10 +67,59 @@ static void ppc_display_machine_stats(void);
static void ppc_dump_line_number(ulong);
static struct line_number_hook ppc_line_number_hooks[];
+struct platform {
+ char *name;
const char *name is better?
+ int pgdir_shift;
+ int ptrs_per_pgd;
+ int ptrs_per_pte;
+ int pte_size;
+} ppc_boards[] = {
+ {
+ /* Always keep the default as the first entry */
+ .name = "default",
+ .pgdir_shift = DEFAULT_PGDIR_SHIFT,
+ .ptrs_per_pgd = DEFAULT_PTRS_PER_PGD,
+ .ptrs_per_pte = DEFAULT_PTRS_PER_PTE,
+ .pte_size = DEFAULT_PTE_SIZE,
+ },
+ {
+ /* Keep this at the end */
+ .name = NULL,
+ }
+};
+
+struct platform *base_platform;
+static struct platform *ppc_get_base_platform(void);
+
/* Defined in diskdump.c */
extern void process_elf32_notes(void *, ulong);
/*
+ * Find the platform of the crashing system and set the
+ * base_platform accordingly.
+ */
+struct platform*
+ppc_get_base_platform(void)
+{
+ char platform[32];
+ struct platform *tmp =&ppc_boards[1]; /* start at 1 */
+ ulong ppc_platform;
+
+ if(!try_get_symbol_data("powerpc_base_platform",
sizeof(ulong),&ppc_platform))
+ return&ppc_boards[0];
+
+ if (read_string(ppc_platform, platform, 31) == 0)
+ return&ppc_boards[0];
+
+ for (; tmp->name!= NULL; tmp++)
+ if (!strcmp(tmp->name, platform))
+ return tmp;
Is there any reasons to distinct "ppc440gp"?
Since I see that there are no "ppc440" prefix platform other than PPC40
in latest cpu_specs[], and all of ppc440gp's values in ppc_boards[] are the
same as ppc440.
Can it be summarized by using STRNEQ("ppc440") or strncmp("ppc440")?
And I often see similar comparisons as SRTEQ() in crash code,
also "unsigned long long" is "ulonglong".
Although I wonder whether they are unspoken rules or not,
I think it is better to use familiarity STREQ() and ulonglong.
Thanks,
Toshi
+
+ /* Use default definitions */
+ return&ppc_boards[0];
+}
+
+/*
* Do all necessary machine-specific setup here. This is called twice,
* before and after GDB has been initialized.
*/
@@ -104,7 +153,6 @@ ppc_init(int when)
machdep->last_pmd_read = 0;
machdep->last_ptbl_read = 0;
machdep->verify_paddr = generic_verify_paddr;
- machdep->ptrs_per_pgd = PTRS_PER_PGD;
break;
case PRE_GDB:
@@ -130,6 +178,11 @@ ppc_init(int when)
machdep->line_number_hooks = ppc_line_number_hooks;
machdep->value_to_symbol = generic_machdep_value_to_symbol;
machdep->init_kernel_pgd = NULL;
+ /* Find the platform where we crashed */
+ base_platform = ppc_get_base_platform();
+
+ machdep->ptrs_per_pgd = PTRS_PER_PGD;
+
break;
case POST_GDB:
@@ -269,14 +322,21 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
ulong *page_middle;
ulong *page_table;
ulong pgd_pte;
- ulong pte;
+ unsigned long long pte;
- if (verbose)
+ if (verbose) {
+ fprintf(fp, "Using %s board definitions:\n", base_platform->name);
fprintf(fp, "PAGE DIRECTORY: %lx\n", (ulong)pgd);
+ }
page_dir = pgd + (vaddr>> PGDIR_SHIFT);
- FILL_PGD(PAGEBASE(pgd), KVADDR, PAGESIZE());
+ /*
+ * Size of a pgd could be more than a PAGE.
+ * So use PAGEBASE(page_dir), instead of
+ * PAGEBASE(pgd) for FILL_PGD()
+ */
+ FILL_PGD(PAGEBASE(page_dir), KVADDR, PAGESIZE());
pgd_pte = ULONG(machdep->pgd + PAGEOFFSET(page_dir));
if (verbose)
@@ -288,10 +348,10 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
page_middle = (ulong *)pgd_pte;
if (machdep->flags& CPU_BOOKE)
- page_table = page_middle + (BTOP(vaddr)& (PTRS_PER_PTE - 1));
+ page_table = (ulong *)((ulong)page_middle + ((ulong)BTOP(vaddr)& (PTRS_PER_PTE -
1)) * PTE_SIZE);
else {
page_table = (ulong *)((pgd_pte& (ulong)machdep->pagemask) +
machdep->kvbase);
- page_table += ((ulong)BTOP(vaddr)& (PTRS_PER_PTE-1));
+ page_table = (ulong *)((ulong)page_table + ((ulong)BTOP(vaddr)& (PTRS_PER_PTE-1))
* PTE_SIZE);
}
if (verbose)
@@ -299,10 +359,14 @@ ppc_pgd_vtop(ulong *pgd, ulong vaddr, physaddr_t *paddr, int
verbose)
(ulong)page_table);
FILL_PTBL(PAGEBASE(page_table), KVADDR, PAGESIZE());
- pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
+ if (PTE_SIZE == sizeof(unsigned long long))
+ pte = ULONGLONG(machdep->ptbl + PAGEOFFSET(page_table));
+
+ else /* Defaults to ulong */
+ pte = ULONG(machdep->ptbl + PAGEOFFSET(page_table));
if (verbose)
- fprintf(fp, " PTE: %lx => %lx\n", (ulong)page_table, pte);
+ fprintf(fp, " PTE: %lx => %llx\n", (ulong)page_table, pte);
if (!(pte& _PAGE_PRESENT)) {
if (pte&& verbose) {
11:08 p.m.
New subject: [PATCH v2 2/3] [ppc] Support for platform based Virtual address translation
Nakayama-San,
> This patch adds infrastructure for defining Virtual address
translation bits
> for each platform and use the specific definition for the platform depending on
> the 'powerpc_base_platform' variable. If a matching platform is not found,
> fallbacks to the default definition.
>
> Each platform can define the PGDIRSHIT, PTRS_PER_PTE and the size of a
> physical address.
>
> I have not modified the size of the machdep->pgd allocation. Instead,
> we always read a PAGESIZE() which contains the entry.
This way is very effectual in several angles, I like it
in addtion to your first integration work.
> Signed-off-by: Suzuki K. Poulose<suzuki(a)in.ibm.com>
> --- a/ppc.c
> +++ b/ppc.c
> @@ -67,10 +67,59 @@ static void ppc_display_machine_stats(void);
> static void ppc_dump_line_number(ulong);
> static struct line_number_hook ppc_line_number_hooks[];
>
> +struct platform {
> + char *name;
const char *name is better?
Yes, will do that.
> + int pgdir_shift;
> + int ptrs_per_pgd;
> + int ptrs_per_pte;
> + int pte_size;
> +} ppc_boards[] = {
> + {
> + /* Always keep the default as the first entry */
> + .name = "default",
> + .pgdir_shift = DEFAULT_PGDIR_SHIFT,
> + .ptrs_per_pgd = DEFAULT_PTRS_PER_PGD,
> + .ptrs_per_pte = DEFAULT_PTRS_PER_PTE,
> + .pte_size = DEFAULT_PTE_SIZE,
> + },
> + {
> + /* Keep this at the end */
> + .name = NULL,
> + }
> +};
> +
> +struct platform *base_platform;
> +static struct platform *ppc_get_base_platform(void);
> +
> /* Defined in diskdump.c */
> extern void process_elf32_notes(void *, ulong);
>
> /*
> + * Find the platform of the crashing system and set the
> + * base_platform accordingly.
> + */
> +struct platform*
> +ppc_get_base_platform(void)
> +{
> + char platform[32];
> + struct platform *tmp =&ppc_boards[1]; /* start at 1 */
> + ulong ppc_platform;
> +
> + if(!try_get_symbol_data("powerpc_base_platform",
sizeof(ulong),&ppc_platform))
> + return&ppc_boards[0];
> +
> + if (read_string(ppc_platform, platform, 31) == 0)
> + return&ppc_boards[0];
> +
> + for (; tmp->name!= NULL; tmp++)
> + if (!strcmp(tmp->name, platform))
> + return tmp;
Is there any reasons to distinct "ppc440gp"?
No specific reasons, apart from just the name difference.
Since I see that there are no "ppc440" prefix platform
other than PPC40
in latest cpu_specs[], and all of ppc440gp's values in ppc_boards[] are the
same as ppc440.
Can it be summarized by using STRNEQ("ppc440") or strncmp("ppc440")?
The problem is, this is generic code. And there could be a different platforms
which start with the same prefix and having different settings for the page
bits, (e.g, freescale processors). So generalizing this would be a problem.
One option I could think of is defining a function rather than a 'name' for each
platform to identify the 'running platform' as its variant.
i.e,
struct platform {
int (*check_platform) (char *s);
const char *name;
...
}
Where we could invoke the check_platform() for each platform, instead of
doing a check ourselves. The check_platform() could be implemented by each
distinct platforms and could use one board definition for multiple platform
values. This would also help us to reduce the 'platform' definitions as different
non-related platforms may also have the same set of definitions.
So the loop would look like :
for (; tmp->name!= NULL; tmp++)
if (tmpe->check_platform(platform))
return tmp;
What do you think about this approach ?
And I often see similar comparisons as SRTEQ() in crash code,
also "unsigned long long" is "ulonglong".
I will switch to
ulonglong.
Thank you, for the review !
Suzuki
8:51 p.m.
New subject: [PATCH v2 2/3] [ppc] Support for platform based Virtual address translation
Suzuki-San,
>> + for (; tmp->name!= NULL; tmp++)
>> + if (!strcmp(tmp->name, platform))
>> + return tmp;
>
> Is there any reasons to distinct "ppc440gp"?
>
No specific reasons, apart from just the name difference.
> Since I see that there are no "ppc440" prefix platform other than PPC40
> in latest cpu_specs[], and all of ppc440gp's values in ppc_boards[] are the
> same as ppc440.
> Can it be summarized by using STRNEQ("ppc440") or
strncmp("ppc440")?
The problem is, this is generic code. And there could be a different platforms
which start with the same prefix and having different settings for the page
bits, (e.g, freescale processors). So generalizing this would be a problem.
I can understand your careful thought, thanks.
One option I could think of is defining a function rather than a
'name' for each
platform to identify the 'running platform' as its variant.
i.e,
struct platform {
int (*check_platform) (char *s);
const char *name;
...
}
Where we could invoke the check_platform() for each platform, instead of
doing a check ourselves. The check_platform() could be implemented by each
distinct platforms and could use one board definition for multiple platform
values. This would also help us to reduce the 'platform' definitions as
different
non-related platforms may also have the same set of definitions.
So the loop would look like :
for (; tmp->name!= NULL; tmp++)
if (tmpe->check_platform(platform))
return tmp;
What do you think about this approach ?
I can imagine that ppc_boards[] own least entries "default", "ppc440",
"ppc??",
(or declare as "ibm",
"freescale", ..)
and call check_ppc440_platform("platform"),
check_ppc??_platform("platform")
to check or update page bits.
The check_ppc440_platform() can do with SRTEQ("platform",
"ppc440(gp)") easily
but check_ppc??_platform() has to check more conditions if prefixed name
has different settings for the page bits.
Finaly check_platform sometimes update page talbe bit members in struct platform.
This is interesting so I wait for your updates
even though my imagination is different from yours.
Thanks,
Toshi
4:46 a.m.
New subject: [PATCH v2 2/3] [ppc] Support for platform based Virtual address translation
On 02/06/2012 08:21 AM, Toshikazu Nakayama wrote:
Suzuki-San,
>>> + for (; tmp->name!= NULL; tmp++)
>>> + if (!strcmp(tmp->name, platform))
>>> + return tmp;
>>
>> Is there any reasons to distinct "ppc440gp"?
>>
> No specific reasons, apart from just the name difference.
>
>> Since I see that there are no "ppc440" prefix platform other than
PPC40
>> in latest cpu_specs[], and all of ppc440gp's values in ppc_boards[] are the
>> same as ppc440.
>> Can it be summarized by using STRNEQ("ppc440") or
strncmp("ppc440")?
> The problem is, this is generic code. And there could be a different platforms
> which start with the same prefix and having different settings for the page
> bits, (e.g, freescale processors). So generalizing this would be a problem.
I can understand your careful thought, thanks.
> One option I could think of is defining a function rather than a 'name' for
each
> platform to identify the 'running platform' as its variant.
>
> i.e,
>
> struct platform {
> int (*check_platform) (char *s);
> const char *name;
> ...
> }
>
> Where we could invoke the check_platform() for each platform, instead of
> doing a check ourselves. The check_platform() could be implemented by each
> distinct platforms and could use one board definition for multiple platform
> values. This would also help us to reduce the 'platform' definitions as
different
> non-related platforms may also have the same set of definitions.
>
> So the loop would look like :
>
> for (; tmp->name!= NULL; tmp++)
> if (tmpe->check_platform(platform))
> return tmp;
>
> What do you think about this approach ?
I can imagine that ppc_boards[] own least entries "default",
"ppc440", "ppc??",
(or declare as "ibm",
"freescale", ..)
and call check_ppc440_platform("platform"),
check_ppc??_platform("platform")
to check or update page bits.
The check_ppc440_platform() can do with SRTEQ("platform",
"ppc440(gp)") easily
but check_ppc??_platform() has to check more conditions if prefixed name
has different settings for the page bits.
Finaly check_platform sometimes update page talbe bit members in struct platform.
This is interesting so I wait for your updates
even though my imagination is different from yours.
Sounds good. I will spin a new version with these changes.
Thanks
Suzuki
2:47 a.m.
New subject: [PATCH v2 3/3] [ppc] virtual address translation bits for PPC440
This patch adds the definition for PPC440 virtual address translation.
On ppc44x, the virtual-address is split as below :
Bits |0 10|11 19|20 31|
-------------------------------------
| PGD | PMD | PAGE_OFFSET |
-----------------------------------
Also the physical address is 64bit.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
defs.h | 5 +++++
ppc.c | 14 ++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/defs.h b/defs.h
index aba13ea..7410412 100755
--- a/defs.h
+++ b/defs.h
@@ -2609,6 +2609,11 @@ struct load_module {
#define DEFAULT_PTRS_PER_PGD (1024)
#define DEFAULT_PTE_SIZE sizeof(ulong)
+/* PPC440 translation bits */
+#define PPC440_PGDIR_SHIFT (21)
+#define PPC440_PTRS_PER_PTE (512)
+#define PPC440_PTRS_PER_PGD (2048)
+#define PPC440_PTE_SIZE sizeof(unsigned long long)
#define PGDIR_SHIFT (base_platform->pgdir_shift)
#define PTRS_PER_PTE (base_platform->ptrs_per_pte)
diff --git a/ppc.c b/ppc.c
index 600df34..ea7247b 100755
--- a/ppc.c
+++ b/ppc.c
@@ -83,6 +83,20 @@ struct platform {
.pte_size = DEFAULT_PTE_SIZE,
},
{
+ .name = "ppc440",
+ .pgdir_shift = PPC440_PGDIR_SHIFT,
+ .ptrs_per_pgd = PPC440_PTRS_PER_PGD,
+ .ptrs_per_pte = PPC440_PTRS_PER_PTE,
+ .pte_size = PPC440_PTE_SIZE,
+ },
+ {
+ .name = "ppc440gp",
+ .pgdir_shift = PPC440_PGDIR_SHIFT,
+ .ptrs_per_pgd = PPC440_PTRS_PER_PGD,
+ .ptrs_per_pte = PPC440_PTRS_PER_PTE,
+ .pte_size = PPC440_PTE_SIZE,
+ },
+ {
/* Keep this at the end */
.name = NULL,
}
4998
days inactive
5003
days old
devel@lists.crash-utility.osci.io
7 comments
2 participants
participants (2)
-
Suzuki K. Poulose -
Toshikazu Nakayama