From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 06/20] powerpc/32s: Make Hash var static
Date: Thu, 22 Oct 2020 06:29:31 +0000 (UTC) [thread overview]
Message-ID: <786c82a89cdfdaabb32b72a44f7c312fa81d192b.1603348103.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <648e2448e938d52d0b5887445e018ca584edc06d.1603348103.git.christophe.leroy@csgroup.eu>
Hash var is used only locally in mmu.c now.
No need to set it in head_32.S anymore.
Make it static and initialises it to the early hash table.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/kernel/head_book3s_32.S | 5 -----
arch/powerpc/mm/book3s32/mmu.c | 2 +-
arch/powerpc/mm/mmu_decl.h | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S
index 5eb9eedac920..620af1dda70c 100644
--- a/arch/powerpc/kernel/head_book3s_32.S
+++ b/arch/powerpc/kernel/head_book3s_32.S
@@ -155,9 +155,7 @@ __after_mmu_off:
bl initial_bats
bl load_segment_registers
-BEGIN_MMU_FTR_SECTION
bl early_hash_table
-END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
#if defined(CONFIG_BOOTX_TEXT)
bl setup_disp_bat
#endif
@@ -931,9 +929,6 @@ early_hash_table:
lis r6, early_hash - PAGE_OFFSET@h
ori r6, r6, 3 /* 256kB table */
mtspr SPRN_SDR1, r6
- lis r6, early_hash@h
- lis r3, Hash@ha
- stw r6, Hash@l(r3)
blr
load_up_mmu:
diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c
index 6612d2a9a1ff..c0c0f2a50f86 100644
--- a/arch/powerpc/mm/book3s32/mmu.c
+++ b/arch/powerpc/mm/book3s32/mmu.c
@@ -33,7 +33,7 @@
u8 __initdata early_hash[SZ_256K] __aligned(SZ_256K) = {0};
-struct hash_pte *Hash;
+static struct hash_pte *Hash = (struct hash_pte *)early_hash;
static unsigned long Hash_size, Hash_mask;
unsigned long _SDR1;
static unsigned int hash_mb, hash_mb2;
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index 1b6d39e9baed..900da3ae03db 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -101,7 +101,6 @@ extern int __map_without_bats;
extern unsigned int rtas_data, rtas_size;
struct hash_pte;
-extern struct hash_pte *Hash;
extern u8 early_hash[];
#endif /* CONFIG_PPC32 */
--
2.25.0
next prev parent reply other threads:[~2020-10-22 6:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 6:29 [PATCH v1 01/20] powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 02/20] powerpc/mm: Add mask of always present MMU features Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 03/20] powerpc/mm: Remove flush_tlb_page_nohash() prototype Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 04/20] powerpc/32s: Make bat_addrs[] static Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 05/20] powerpc/32s: Use mmu_has_feature(MMU_FTR_HPTE_TABLE) instead of checking Hash var Christophe Leroy
2020-10-22 6:29 ` Christophe Leroy [this message]
2020-10-22 6:29 ` [PATCH v1 07/20] powerpc/32s: Declare Hash related vars as __initdata Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 08/20] powerpc/32s: Move _tlbie() and _tlbia() prototypes to tlbflush.h Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 09/20] powerpc/32s: Inline _tlbie() on non SMP Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 10/20] powerpc/32s: Move _tlbie() and _tlbia() in a new file Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 11/20] powerpc/32s: Split and inline flush_tlb_mm() and flush_tlb_page() Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 12/20] powerpc/32s: Inline flush_tlb_range() and flush_tlb_kernel_range() Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 13/20] powerpc/32s: Split and inline flush_range() Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 14/20] powerpc/32s: Inline tlb_flush() Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 15/20] powerpc/32s: Inline flush_hash_entry() Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 16/20] powerpc/32s: Move early_mmu_init() into mmu.c Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 17/20] powerpc/32s: Remove CONFIG_PPC_BOOK3S_6xx Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 18/20] powerpc/32s: Regroup 603 based CPUs in cputable Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 19/20] powerpc/32s: Make support for 603 and 604+ selectable Christophe Leroy
2020-10-22 6:29 ` [PATCH v1 20/20] powerpc/32s: Only build hash code when CONFIG_PPC_BOOK3S_604 is selected Christophe Leroy
2020-12-15 10:53 ` [PATCH v1 01/20] powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Michael Ellerman
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=786c82a89cdfdaabb32b72a44f7c312fa81d192b.1603348103.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--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 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).