From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
Michael Ellerman <mpe@ellerman.id.au>,
Sasha Levin <sashal@kernel.org>,
npiggin@gmail.com, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH AUTOSEL 5.15 24/44] powerpc/40x: Map 32Mbytes of memory at startup
Date: Mon, 17 Jan 2022 12:01:07 -0500 [thread overview]
Message-ID: <20220117170127.1471115-24-sashal@kernel.org> (raw)
In-Reply-To: <20220117170127.1471115-1-sashal@kernel.org>
From: Christophe Leroy <christophe.leroy@csgroup.eu>
[ Upstream commit 06e7cbc29e97b4713b4ea6def04ae8501a7d1a59 ]
As reported by Carlo, 16Mbytes is not enough with modern kernels
that tend to be a bit big, so map another 16M page at boot.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/89b5f974a7fa5011206682cd092e2c905530ff46.1632755552.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/powerpc/kernel/head_40x.S | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 7d72ee5ab387c..e783860bea838 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -27,6 +27,7 @@
#include <linux/init.h>
#include <linux/pgtable.h>
+#include <linux/sizes.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/mmu.h>
@@ -650,7 +651,7 @@ start_here:
b . /* prevent prefetch past rfi */
/* Set up the initial MMU state so we can do the first level of
- * kernel initialization. This maps the first 16 MBytes of memory 1:1
+ * kernel initialization. This maps the first 32 MBytes of memory 1:1
* virtual to physical and more importantly sets the cache mode.
*/
initial_mmu:
@@ -687,6 +688,12 @@ initial_mmu:
tlbwe r4,r0,TLB_DATA /* Load the data portion of the entry */
tlbwe r3,r0,TLB_TAG /* Load the tag portion of the entry */
+ li r0,62 /* TLB slot 62 */
+ addis r4,r4,SZ_16M@h
+ addis r3,r3,SZ_16M@h
+ tlbwe r4,r0,TLB_DATA /* Load the data portion of the entry */
+ tlbwe r3,r0,TLB_TAG /* Load the tag portion of the entry */
+
isync
/* Establish the exception vector base
--
2.34.1
next prev parent reply other threads:[~2022-01-17 17:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 17:00 [PATCH AUTOSEL 5.15 01/44] clk: imx: Use div64_ul instead of do_div Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 02/44] powerpc/6xx: add missing of_node_put Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 03/44] powerpc/powernv: " Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 04/44] powerpc/cell: " Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 05/44] powerpc/btext: " Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 06/44] powerpc/watchdog: Fix missed watchdog reset due to memory ordering race Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 07/44] ASoC: imx-hdmi: add put_device() after of_find_device_by_node() Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 08/44] i2c: i801: Don't silently correct invalid transfer size Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 09/44] powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 10/44] i2c: mpc: Correct I2C reset procedure Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 11/44] clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 12/44] powerpc/powermac: Add missing lockdep_register_key() Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 13/44] KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 14/44] KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 15/44] w1: Misuse of get_user()/put_user() reported by sparse Sasha Levin
2022-01-17 17:00 ` [PATCH AUTOSEL 5.15 16/44] nvmem: core: set size for sysfs bin file Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 17/44] dm: fix alloc_dax error handling in alloc_dev Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 18/44] interconnect: qcom: rpm: Prevent integer overflow in rate Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 19/44] scsi: ufs: Fix a kernel crash during shutdown Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 20/44] scsi: lpfc: Fix leaked lpfc_dmabuf mbox allocations with NPIV Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 21/44] scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 22/44] ALSA: seq: Set upper limit of processed events Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 23/44] MIPS: Loongson64: Use three arguments for slti Sasha Levin
2022-01-17 17:01 ` Sasha Levin [this message]
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 25/44] selftests/powerpc/spectre_v2: Return skip code when miss_percent is high Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 26/44] powerpc: handle kdump appropriately with crash_kexec_post_notifiers option Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 27/44] powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 28/44] udf: Fix error handling in udf_new_inode() Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 29/44] MIPS: OCTEON: add put_device() after of_find_device_by_node() Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 30/44] irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 31/44] i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 32/44] PCI/MSI: Decouple MSI[-X] disable from pcim_release() Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 33/44] selftests/powerpc: Add a test of sigreturning to the kernel Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 34/44] MIPS: Octeon: Fix build errors using clang Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 35/44] scsi: sr: Don't use GFP_DMA Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 36/44] scsi: mpi3mr: Fixes around reply request queues Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 37/44] ASoC: mediatek: mt8192-mt6359: fix device_node leak Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 38/44] phy: phy-mtk-tphy: add support efuse setting Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 39/44] ASoC: mediatek: mt8173: fix device_node leak Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 40/44] ASoC: mediatek: mt8183: " Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 41/44] habanalabs: skip read fw errors if dynamic descriptor invalid Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 42/44] phy: mediatek: Fix missing check in mtk_mipi_tx_probe Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 43/44] mailbox: change mailbox-mpfs compatible string Sasha Levin
2022-01-17 17:01 ` [PATCH AUTOSEL 5.15 44/44] leds: leds-fsg: Drop FSG3 LED driver Sasha Levin
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=20220117170127.1471115-24-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=stable@vger.kernel.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
Powered by JetHome