|
 |
acf3ec |
From 656f0b50866247a2fdb2d0c917f0a7a3f34c2e7d Mon Sep 17 00:00:00 2001
|
|
|
acf3ec |
From: Hari Bathini <hbathini@linux.ibm.com>
|
|
|
acf3ec |
Date: Mon, 4 Jul 2022 10:55:46 +0530
|
|
|
acf3ec |
Subject: [PATCH 08/28] ppc64: use a variable for machdep->machspec
|
|
|
acf3ec |
|
|
|
acf3ec |
machdpep->machspec is referred to multiple times. The compiler would
|
|
|
acf3ec |
likely optimize this but nonetheless, use a variable to optimize in
|
|
|
acf3ec |
coding and also improve readability. No functional change.
|
|
|
acf3ec |
|
|
|
acf3ec |
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
|
|
|
acf3ec |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
acf3ec |
---
|
|
|
acf3ec |
ppc64.c | 224 ++++++++++++++++++++++++++++----------------------------
|
|
|
acf3ec |
1 file changed, 111 insertions(+), 113 deletions(-)
|
|
|
acf3ec |
|
|
|
acf3ec |
diff --git a/ppc64.c b/ppc64.c
|
|
|
acf3ec |
index ad1d6e121e81..4ea1f7c0c6f8 100644
|
|
|
acf3ec |
--- a/ppc64.c
|
|
|
acf3ec |
+++ b/ppc64.c
|
|
|
acf3ec |
@@ -307,6 +307,8 @@ struct machine_specific book3e_machine_specific = {
|
|
|
acf3ec |
void
|
|
|
acf3ec |
ppc64_init(int when)
|
|
|
acf3ec |
{
|
|
|
acf3ec |
+ struct machine_specific *ms;
|
|
|
acf3ec |
+
|
|
|
acf3ec |
#if defined(__x86_64__)
|
|
|
acf3ec |
if (ACTIVE())
|
|
|
acf3ec |
error(FATAL, "compiled for the PPC64 architecture\n");
|
|
|
acf3ec |
@@ -416,16 +418,16 @@ ppc64_init(int when)
|
|
|
acf3ec |
break;
|
|
|
acf3ec |
|
|
|
acf3ec |
case POST_GDB:
|
|
|
acf3ec |
- if (!(machdep->flags & BOOK3E)) {
|
|
|
acf3ec |
- struct machine_specific *m = machdep->machspec;
|
|
|
acf3ec |
+ ms = machdep->machspec;
|
|
|
acf3ec |
|
|
|
acf3ec |
+ if (!(machdep->flags & BOOK3E)) {
|
|
|
acf3ec |
/*
|
|
|
acf3ec |
* To determine if the kernel was running on OPAL based platform,
|
|
|
acf3ec |
* use struct opal, which is populated with relevant values.
|
|
|
acf3ec |
*/
|
|
|
acf3ec |
if (symbol_exists("opal")) {
|
|
|
acf3ec |
- get_symbol_data("opal", sizeof(struct ppc64_opal), &(m->opal));
|
|
|
acf3ec |
- if (m->opal.base == SKIBOOT_BASE)
|
|
|
acf3ec |
+ get_symbol_data("opal", sizeof(struct ppc64_opal), &(ms->opal));
|
|
|
acf3ec |
+ if (ms->opal.base == SKIBOOT_BASE)
|
|
|
acf3ec |
machdep->flags |= OPAL_FW;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
@@ -453,18 +455,18 @@ ppc64_init(int when)
|
|
|
acf3ec |
* _PAGE_WRITETHRU can be used to infer it.
|
|
|
acf3ec |
*/
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(3,14,0))
|
|
|
acf3ec |
- m->_page_coherent = 0x0UL;
|
|
|
acf3ec |
+ ms->_page_coherent = 0x0UL;
|
|
|
acf3ec |
|
|
|
acf3ec |
/*
|
|
|
acf3ec |
* In kernel v4.5, _PAGE_PTE bit is introduced to
|
|
|
acf3ec |
* distinguish PTEs from pointers.
|
|
|
acf3ec |
*/
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,5,0)) {
|
|
|
acf3ec |
- m->_page_pte = 0x1UL;
|
|
|
acf3ec |
- m->_page_present = 0x2UL;
|
|
|
acf3ec |
- m->_page_user = 0x4UL;
|
|
|
acf3ec |
- m->_page_rw = 0x8UL;
|
|
|
acf3ec |
- m->_page_guarded = 0x10UL;
|
|
|
acf3ec |
+ ms->_page_pte = 0x1UL;
|
|
|
acf3ec |
+ ms->_page_present = 0x2UL;
|
|
|
acf3ec |
+ ms->_page_user = 0x4UL;
|
|
|
acf3ec |
+ ms->_page_rw = 0x8UL;
|
|
|
acf3ec |
+ ms->_page_guarded = 0x10UL;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
/*
|
|
|
acf3ec |
@@ -474,8 +476,8 @@ ppc64_init(int when)
|
|
|
acf3ec |
* Also, page table entries store physical addresses.
|
|
|
acf3ec |
*/
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,6,0)) {
|
|
|
acf3ec |
- m->_page_pte = 0x1UL << 62;
|
|
|
acf3ec |
- m->_page_present = 0x1UL << 63;
|
|
|
acf3ec |
+ ms->_page_pte = 0x1UL << 62;
|
|
|
acf3ec |
+ ms->_page_present = 0x1UL << 63;
|
|
|
acf3ec |
machdep->flags |= PHYS_ENTRY_L4;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
@@ -504,118 +506,117 @@ ppc64_init(int when)
|
|
|
acf3ec |
machdep->ptrs_per_pgd = PTRS_PER_PGD;
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
/* 2.6.14 layout */
|
|
|
acf3ec |
- struct machine_specific *m = machdep->machspec;
|
|
|
acf3ec |
if (machdep->pagesize == 65536) {
|
|
|
acf3ec |
/* 64K pagesize */
|
|
|
acf3ec |
if (machdep->flags & RADIX_MMU) {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_RADIX_64K;
|
|
|
acf3ec |
|
|
|
acf3ec |
} else if (!(machdep->flags & BOOK3E) &&
|
|
|
acf3ec |
(THIS_KERNEL_VERSION >= LINUX(4,6,0))) {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,12,0)) {
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,17,0))
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_17;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_17;
|
|
|
acf3ec |
else
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_L4_64K_4_12;
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_6;
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_6;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_L4_64K_4_6;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_64K_4_6;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
} else if (THIS_KERNEL_VERSION >= LINUX(3,10,0)) {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_L4_64K_3_10;
|
|
|
acf3ec |
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_L4_64K;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
if (!(machdep->flags & BOOK3E))
|
|
|
acf3ec |
- m->pte_rpn_shift = symbol_exists("demote_segment_4k") ?
|
|
|
acf3ec |
+ ms->pte_rpn_shift = symbol_exists("demote_segment_4k") ?
|
|
|
acf3ec |
PTE_RPN_SHIFT_L4_64K_V2 : PTE_RPN_SHIFT_L4_64K_V1;
|
|
|
acf3ec |
|
|
|
acf3ec |
if (!(machdep->flags & BOOK3E) &&
|
|
|
acf3ec |
(THIS_KERNEL_VERSION >= LINUX(4,6,0))) {
|
|
|
acf3ec |
- m->pgd_masked_bits = PGD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
- m->pud_masked_bits = PUD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
+ ms->pgd_masked_bits = PGD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
+ ms->pud_masked_bits = PUD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_64K_4_6;
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
- m->pgd_masked_bits = PGD_MASKED_BITS_64K;
|
|
|
acf3ec |
- m->pud_masked_bits = PUD_MASKED_BITS_64K;
|
|
|
acf3ec |
+ ms->pgd_masked_bits = PGD_MASKED_BITS_64K;
|
|
|
acf3ec |
+ ms->pud_masked_bits = PUD_MASKED_BITS_64K;
|
|
|
acf3ec |
if ((machdep->flags & BOOK3E) &&
|
|
|
acf3ec |
(THIS_KERNEL_VERSION >= LINUX(4,5,0)))
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_BOOK3E_64K_4_5;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_BOOK3E_64K_4_5;
|
|
|
acf3ec |
else if (THIS_KERNEL_VERSION >= LINUX(3,11,0))
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_64K_3_11;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_64K_3_11;
|
|
|
acf3ec |
else
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_64K;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_64K;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
/* 4K pagesize */
|
|
|
acf3ec |
if (machdep->flags & RADIX_MMU) {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_RADIX_4K;
|
|
|
acf3ec |
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
- m->l1_index_size = PTE_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
- m->l2_index_size = PMD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
+ ms->l1_index_size = PTE_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
+ ms->l2_index_size = PMD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(3,7,0))
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_4K_3_7;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_4K_3_7;
|
|
|
acf3ec |
else
|
|
|
acf3ec |
- m->l3_index_size = PUD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
- m->l4_index_size = PGD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
+ ms->l3_index_size = PUD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
+ ms->l4_index_size = PGD_INDEX_SIZE_L4_4K;
|
|
|
acf3ec |
|
|
|
acf3ec |
if (machdep->flags & BOOK3E)
|
|
|
acf3ec |
- m->pte_rpn_shift = PTE_RPN_SHIFT_L4_BOOK3E_4K;
|
|
|
acf3ec |
+ ms->pte_rpn_shift = PTE_RPN_SHIFT_L4_BOOK3E_4K;
|
|
|
acf3ec |
else
|
|
|
acf3ec |
- m->pte_rpn_shift = THIS_KERNEL_VERSION >= LINUX(4,5,0) ?
|
|
|
acf3ec |
+ ms->pte_rpn_shift = THIS_KERNEL_VERSION >= LINUX(4,5,0) ?
|
|
|
acf3ec |
PTE_RPN_SHIFT_L4_4K_4_5 : PTE_RPN_SHIFT_L4_4K;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
- m->pgd_masked_bits = PGD_MASKED_BITS_4K;
|
|
|
acf3ec |
- m->pud_masked_bits = PUD_MASKED_BITS_4K;
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_4K;
|
|
|
acf3ec |
+ ms->pgd_masked_bits = PGD_MASKED_BITS_4K;
|
|
|
acf3ec |
+ ms->pud_masked_bits = PUD_MASKED_BITS_4K;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_4K;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
- m->pte_rpn_mask = PTE_RPN_MASK_DEFAULT;
|
|
|
acf3ec |
+ ms->pte_rpn_mask = PTE_RPN_MASK_DEFAULT;
|
|
|
acf3ec |
if (!(machdep->flags & BOOK3E)) {
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,6,0)) {
|
|
|
acf3ec |
- m->pte_rpn_mask = PTE_RPN_MASK_L4_4_6;
|
|
|
acf3ec |
- m->pte_rpn_shift = PTE_RPN_SHIFT_L4_4_6;
|
|
|
acf3ec |
+ ms->pte_rpn_mask = PTE_RPN_MASK_L4_4_6;
|
|
|
acf3ec |
+ ms->pte_rpn_shift = PTE_RPN_SHIFT_L4_4_6;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
if (THIS_KERNEL_VERSION >= LINUX(4,7,0)) {
|
|
|
acf3ec |
- m->pgd_masked_bits = PGD_MASKED_BITS_4_7;
|
|
|
acf3ec |
- m->pud_masked_bits = PUD_MASKED_BITS_4_7;
|
|
|
acf3ec |
- m->pmd_masked_bits = PMD_MASKED_BITS_4_7;
|
|
|
acf3ec |
+ ms->pgd_masked_bits = PGD_MASKED_BITS_4_7;
|
|
|
acf3ec |
+ ms->pud_masked_bits = PUD_MASKED_BITS_4_7;
|
|
|
acf3ec |
+ ms->pmd_masked_bits = PMD_MASKED_BITS_4_7;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
/* Compute ptrs per each level */
|
|
|
acf3ec |
- m->l1_shift = machdep->pageshift;
|
|
|
acf3ec |
- m->ptrs_per_l1 = (1 << m->l1_index_size);
|
|
|
acf3ec |
- m->ptrs_per_l2 = (1 << m->l2_index_size);
|
|
|
acf3ec |
- m->ptrs_per_l3 = (1 << m->l3_index_size);
|
|
|
acf3ec |
- m->ptrs_per_l4 = (1 << m->l4_index_size);
|
|
|
acf3ec |
- machdep->ptrs_per_pgd = m->ptrs_per_l4;
|
|
|
acf3ec |
+ ms->l1_shift = machdep->pageshift;
|
|
|
acf3ec |
+ ms->ptrs_per_l1 = (1 << ms->l1_index_size);
|
|
|
acf3ec |
+ ms->ptrs_per_l2 = (1 << ms->l2_index_size);
|
|
|
acf3ec |
+ ms->ptrs_per_l3 = (1 << ms->l3_index_size);
|
|
|
acf3ec |
+ ms->ptrs_per_l4 = (1 << ms->l4_index_size);
|
|
|
acf3ec |
+ machdep->ptrs_per_pgd = ms->ptrs_per_l4;
|
|
|
acf3ec |
|
|
|
acf3ec |
/* Compute shifts */
|
|
|
acf3ec |
- m->l2_shift = m->l1_shift + m->l1_index_size;
|
|
|
acf3ec |
- m->l3_shift = m->l2_shift + m->l2_index_size;
|
|
|
acf3ec |
- m->l4_shift = m->l3_shift + m->l3_index_size;
|
|
|
acf3ec |
+ ms->l2_shift = ms->l1_shift + ms->l1_index_size;
|
|
|
acf3ec |
+ ms->l3_shift = ms->l2_shift + ms->l2_index_size;
|
|
|
acf3ec |
+ ms->l4_shift = ms->l3_shift + ms->l3_index_size;
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
if (machdep->flags & VMEMMAP)
|
|
|
acf3ec |
@@ -681,19 +682,15 @@ ppc64_init(int when)
|
|
|
acf3ec |
*/
|
|
|
acf3ec |
offset = MEMBER_OFFSET("paca_struct", "xHrdIntStack");
|
|
|
acf3ec |
paca_sym = symbol_value("paca");
|
|
|
acf3ec |
- if (!(machdep->machspec->hwintrstack =
|
|
|
acf3ec |
- (ulong *)calloc(NR_CPUS, sizeof(ulong))))
|
|
|
acf3ec |
+ if (!(ms->hwintrstack = (ulong *)calloc(NR_CPUS, sizeof(ulong))))
|
|
|
acf3ec |
error(FATAL, "cannot malloc hwintrstack space.");
|
|
|
acf3ec |
for (cpu = 0; cpu < kt->cpus; cpu++) {
|
|
|
acf3ec |
- readmem(paca_sym + (paca_size * cpu) + offset,
|
|
|
acf3ec |
- KVADDR,
|
|
|
acf3ec |
- &machdep->machspec->hwintrstack[cpu],
|
|
|
acf3ec |
- sizeof(ulong), "PPC64 HW_intr_stack",
|
|
|
acf3ec |
- FAULT_ON_ERROR);
|
|
|
acf3ec |
+ readmem(paca_sym + (paca_size * cpu) + offset, KVADDR,
|
|
|
acf3ec |
+ &ms->hwintrstack[cpu], sizeof(ulong),
|
|
|
acf3ec |
+ "PPC64 HW_intr_stack", FAULT_ON_ERROR);
|
|
|
acf3ec |
}
|
|
|
acf3ec |
- machdep->machspec->hwstacksize = 8 * machdep->pagesize;
|
|
|
acf3ec |
- if ((machdep->machspec->hwstackbuf = (char *)
|
|
|
acf3ec |
- malloc(machdep->machspec->hwstacksize)) == NULL)
|
|
|
acf3ec |
+ ms->hwstacksize = 8 * machdep->pagesize;
|
|
|
acf3ec |
+ if ((ms->hwstackbuf = (char *)malloc(ms->hwstacksize)) == NULL)
|
|
|
acf3ec |
error(FATAL, "cannot malloc hwirqstack buffer space.");
|
|
|
acf3ec |
}
|
|
|
acf3ec |
|
|
|
acf3ec |
@@ -756,6 +753,7 @@ ppc64_get_stacktop(ulong task)
|
|
|
acf3ec |
void
|
|
|
acf3ec |
ppc64_dump_machdep_table(ulong arg)
|
|
|
acf3ec |
{
|
|
|
acf3ec |
+ struct machine_specific *ms = machdep->machspec;
|
|
|
acf3ec |
int i, c, others;
|
|
|
acf3ec |
|
|
|
acf3ec |
others = 0;
|
|
|
acf3ec |
@@ -844,57 +842,57 @@ ppc64_dump_machdep_table(ulong arg)
|
|
|
acf3ec |
i, machdep->cmdline_args[i] ?
|
|
|
acf3ec |
machdep->cmdline_args[i] : "(unused)");
|
|
|
acf3ec |
}
|
|
|
acf3ec |
- fprintf(fp, " machspec: %lx\n", (ulong)machdep->machspec);
|
|
|
acf3ec |
+ fprintf(fp, " machspec: %lx\n", (ulong)ms);
|
|
|
acf3ec |
fprintf(fp, " is_kvaddr: %s\n",
|
|
|
acf3ec |
- machdep->machspec->is_kvaddr == book3e_is_kvaddr ?
|
|
|
acf3ec |
+ ms->is_kvaddr == book3e_is_kvaddr ?
|
|
|
acf3ec |
"book3e_is_kvaddr()" : "generic_is_kvaddr()");
|
|
|
acf3ec |
fprintf(fp, " is_vmaddr: %s\n",
|
|
|
acf3ec |
- machdep->machspec->is_vmaddr == book3e_is_vmaddr ?
|
|
|
acf3ec |
+ ms->is_vmaddr == book3e_is_vmaddr ?
|
|
|
acf3ec |
"book3e_is_vmaddr()" : "ppc64_is_vmaddr()");
|
|
|
acf3ec |
- if (machdep->machspec->hwintrstack) {
|
|
|
acf3ec |
+ if (ms->hwintrstack) {
|
|
|
acf3ec |
fprintf(fp, " hwintrstack[%d]: ", NR_CPUS);
|
|
|
acf3ec |
for (c = 0; c < NR_CPUS; c++) {
|
|
|
acf3ec |
fprintf(fp, "%s%016lx ",
|
|
|
acf3ec |
((c % 4) == 0) ? "\n " : "",
|
|
|
acf3ec |
- machdep->machspec->hwintrstack[c]);
|
|
|
acf3ec |
+ ms->hwintrstack[c]);
|
|
|
acf3ec |
}
|
|
|
acf3ec |
} else
|
|
|
acf3ec |
fprintf(fp, " hwintrstack: (unused)");
|
|
|
acf3ec |
fprintf(fp, "\n");
|
|
|
acf3ec |
- fprintf(fp, " hwstackbuf: %lx\n", (ulong)machdep->machspec->hwstackbuf);
|
|
|
acf3ec |
- fprintf(fp, " hwstacksize: %d\n", machdep->machspec->hwstacksize);
|
|
|
acf3ec |
- fprintf(fp, " l4_index_size: %d\n", machdep->machspec->l4_index_size);
|
|
|
acf3ec |
- fprintf(fp, " l3_index_size: %d\n", machdep->machspec->l3_index_size);
|
|
|
acf3ec |
- fprintf(fp, " l2_index_size: %d\n", machdep->machspec->l2_index_size);
|
|
|
acf3ec |
- fprintf(fp, " l1_index_size: %d\n", machdep->machspec->l1_index_size);
|
|
|
acf3ec |
- fprintf(fp, " ptrs_per_l4: %d\n", machdep->machspec->ptrs_per_l4);
|
|
|
acf3ec |
- fprintf(fp, " ptrs_per_l3: %d\n", machdep->machspec->ptrs_per_l3);
|
|
|
acf3ec |
- fprintf(fp, " ptrs_per_l2: %d\n", machdep->machspec->ptrs_per_l2);
|
|
|
acf3ec |
- fprintf(fp, " ptrs_per_l1: %d\n", machdep->machspec->ptrs_per_l1);
|
|
|
acf3ec |
- fprintf(fp, " l4_shift: %d\n", machdep->machspec->l4_shift);
|
|
|
acf3ec |
- fprintf(fp, " l3_shift: %d\n", machdep->machspec->l3_shift);
|
|
|
acf3ec |
- fprintf(fp, " l2_shift: %d\n", machdep->machspec->l2_shift);
|
|
|
acf3ec |
- fprintf(fp, " l1_shift: %d\n", machdep->machspec->l1_shift);
|
|
|
acf3ec |
- fprintf(fp, " pte_rpn_mask: %lx\n", machdep->machspec->pte_rpn_mask);
|
|
|
acf3ec |
- fprintf(fp, " pte_rpn_shift: %d\n", machdep->machspec->pte_rpn_shift);
|
|
|
acf3ec |
- fprintf(fp, " pgd_masked_bits: %lx\n", machdep->machspec->pgd_masked_bits);
|
|
|
acf3ec |
- fprintf(fp, " pud_masked_bits: %lx\n", machdep->machspec->pud_masked_bits);
|
|
|
acf3ec |
- fprintf(fp, " pmd_masked_bits: %lx\n", machdep->machspec->pmd_masked_bits);
|
|
|
acf3ec |
+ fprintf(fp, " hwstackbuf: %lx\n", (ulong)ms->hwstackbuf);
|
|
|
acf3ec |
+ fprintf(fp, " hwstacksize: %d\n", ms->hwstacksize);
|
|
|
acf3ec |
+ fprintf(fp, " l4_index_size: %d\n", ms->l4_index_size);
|
|
|
acf3ec |
+ fprintf(fp, " l3_index_size: %d\n", ms->l3_index_size);
|
|
|
acf3ec |
+ fprintf(fp, " l2_index_size: %d\n", ms->l2_index_size);
|
|
|
acf3ec |
+ fprintf(fp, " l1_index_size: %d\n", ms->l1_index_size);
|
|
|
acf3ec |
+ fprintf(fp, " ptrs_per_l4: %d\n", ms->ptrs_per_l4);
|
|
|
acf3ec |
+ fprintf(fp, " ptrs_per_l3: %d\n", ms->ptrs_per_l3);
|
|
|
acf3ec |
+ fprintf(fp, " ptrs_per_l2: %d\n", ms->ptrs_per_l2);
|
|
|
acf3ec |
+ fprintf(fp, " ptrs_per_l1: %d\n", ms->ptrs_per_l1);
|
|
|
acf3ec |
+ fprintf(fp, " l4_shift: %d\n", ms->l4_shift);
|
|
|
acf3ec |
+ fprintf(fp, " l3_shift: %d\n", ms->l3_shift);
|
|
|
acf3ec |
+ fprintf(fp, " l2_shift: %d\n", ms->l2_shift);
|
|
|
acf3ec |
+ fprintf(fp, " l1_shift: %d\n", ms->l1_shift);
|
|
|
acf3ec |
+ fprintf(fp, " pte_rpn_mask: %lx\n", ms->pte_rpn_mask);
|
|
|
acf3ec |
+ fprintf(fp, " pte_rpn_shift: %d\n", ms->pte_rpn_shift);
|
|
|
acf3ec |
+ fprintf(fp, " pgd_masked_bits: %lx\n", ms->pgd_masked_bits);
|
|
|
acf3ec |
+ fprintf(fp, " pud_masked_bits: %lx\n", ms->pud_masked_bits);
|
|
|
acf3ec |
+ fprintf(fp, " pmd_masked_bits: %lx\n", ms->pmd_masked_bits);
|
|
|
acf3ec |
fprintf(fp, " vmemmap_base: ");
|
|
|
acf3ec |
- if (machdep->machspec->vmemmap_base)
|
|
|
acf3ec |
- fprintf(fp, "%lx\n", machdep->machspec->vmemmap_base);
|
|
|
acf3ec |
+ if (ms->vmemmap_base)
|
|
|
acf3ec |
+ fprintf(fp, "%lx\n", ms->vmemmap_base);
|
|
|
acf3ec |
else
|
|
|
acf3ec |
fprintf(fp, "(unused)\n");
|
|
|
acf3ec |
- if (machdep->machspec->vmemmap_cnt) {
|
|
|
acf3ec |
+ if (ms->vmemmap_cnt) {
|
|
|
acf3ec |
fprintf(fp, " vmemmap_cnt: %d\n",
|
|
|
acf3ec |
- machdep->machspec->vmemmap_cnt);
|
|
|
acf3ec |
+ ms->vmemmap_cnt);
|
|
|
acf3ec |
fprintf(fp, " vmemmap_psize: %d\n",
|
|
|
acf3ec |
- machdep->machspec->vmemmap_psize);
|
|
|
acf3ec |
- for (i = 0; i < machdep->machspec->vmemmap_cnt; i++) {
|
|
|
acf3ec |
+ ms->vmemmap_psize);
|
|
|
acf3ec |
+ for (i = 0; i < ms->vmemmap_cnt; i++) {
|
|
|
acf3ec |
fprintf(fp,
|
|
|
acf3ec |
" vmemmap_list[%d]: virt: %lx phys: %lx\n", i,
|
|
|
acf3ec |
- machdep->machspec->vmemmap_list[i].virt,
|
|
|
acf3ec |
- machdep->machspec->vmemmap_list[i].phys);
|
|
|
acf3ec |
+ ms->vmemmap_list[i].virt,
|
|
|
acf3ec |
+ ms->vmemmap_list[i].phys);
|
|
|
acf3ec |
}
|
|
|
acf3ec |
} else {
|
|
|
acf3ec |
fprintf(fp, " vmemmap_cnt: (unused)\n");
|
|
|
acf3ec |
--
|
|
|
acf3ec |
2.37.1
|
|
|
acf3ec |
|