From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7700CD63954 for ; Wed, 20 Nov 2024 14:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YU9ylLInmJutWcFwS2fCxYkWXq6zztLQOerq3Uv4fKE=; b=pl1bI19YQTypopvgANBXOs+sVZ reESH79U5BpmBOqDHiB1JGNtlOIOYp3mN561uBCgxAkRoTLlDiEtkW9j4HIpap97arOWDO+rTMUV1 tplhLwsOa1O8QksD6ECyFKfw61FcQmilD/Dqh1WVBWbJwCzK4cM+VkSWUuCiCSEl2iZ9rBIJqeA+3 xwBOPL6G4PClOXZRXCIg4NXsJp8qLtLOguPFh+7wUzNFCwUITbE+SQRhPKwuswNKj5baCGpe8ssYV p6npPQsK3EawOUBs0ssyfqFaV7rcim/ULptVVkS7AI/4kECEwyxvoYQ3bjd5kIlSkWXpuBrIfru+P lzmyPfzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tDlOS-0000000FUgM-2FoR; Wed, 20 Nov 2024 14:09:20 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tDlMH-0000000FU9l-1aLK for linux-arm-kernel@lists.infradead.org; Wed, 20 Nov 2024 14:07:06 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E8AEC5C05F1; Wed, 20 Nov 2024 14:06:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A596BC4CECD; Wed, 20 Nov 2024 14:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732111624; bh=rAPJ3CsyNt0xoIeocO8Oj1jzcSTExIhRjL94487yK10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5BYoflZJ6RrsFkgjIqkDCpOKGNFbSPnMP+FEcg+ClC3KeHUrz63qvzckgAZSZ8Li D7T/yFQinnXaRwZ6wdAZnQXbV8QO1YF5PMChf4nw4Hu9F+rWis3uRmwdNIiLLmVnQw 3d+ltJM2fxQajGJ1lEFabBsmfgv9zl6F3nJnx7U5aSS8s0IYxAcvMxJEE0CjyaHCNS 9E8aQOeShIACv9yal1hGk85DeeM+ToDRIkEOhWiSjOG+lVGdKiQBd3DYayD5K8cVux spLxMjBoXuypj90lrITVljuJ88n9GFA7XDuiDaqupJckvcKygeN8Z7G3sgvA21hsYf n3A1Mq9FQR4jA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harith G , Linus Walleij , Russell King , Sasha Levin , linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 4/6] ARM: 9420/1: smp: Fix SMP for xip kernels Date: Wed, 20 Nov 2024 09:06:34 -0500 Message-ID: <20241120140647.1768984-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120140647.1768984-1-sashal@kernel.org> References: <20241120140647.1768984-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.62 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241120_060705_492945_EC3AD8B1 X-CRM114-Status: GOOD ( 11.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Harith G [ Upstream commit 9e9b0cf9319b4db143014477b0bc4b39894248f1 ] Fix the physical address calculation of the following to get smp working on xip kernels. - secondary_data needed for secondary cpu bootup. - secondary_startup address passed through psci. - identity mapped code region needed for enabling mmu for secondary cpus. Signed-off-by: Harith George Reviewed-by: Linus Walleij Signed-off-by: Russell King (Oracle) Signed-off-by: Sasha Levin --- arch/arm/kernel/head.S | 4 ++++ arch/arm/kernel/psci_smp.c | 7 +++++++ arch/arm/mm/idmap.c | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 1ec35f065617e..e573adfe73b28 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -407,7 +407,11 @@ ENTRY(secondary_startup) /* * Use the page tables supplied from __cpu_up. */ +#ifdef CONFIG_XIP_KERNEL + ldr r3, =(secondary_data + PLAT_PHYS_OFFSET - PAGE_OFFSET) +#else adr_l r3, secondary_data +#endif mov_l r12, __secondary_switched ldrd r4, r5, [r3, #0] @ get secondary_data.pgdir ARM_BE8(eor r4, r4, r5) @ Swap r5 and r4 in BE: diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index d4392e1774848..3bb0c4dcfc5c9 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -45,8 +45,15 @@ extern void secondary_startup(void); static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) { if (psci_ops.cpu_on) +#ifdef CONFIG_XIP_KERNEL + return psci_ops.cpu_on(cpu_logical_map(cpu), + ((phys_addr_t)(&secondary_startup) + - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) + + CONFIG_XIP_PHYS_ADDR)); +#else return psci_ops.cpu_on(cpu_logical_map(cpu), virt_to_idmap(&secondary_startup)); +#endif return -ENODEV; } diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c index 448e57c6f6534..4a833e89782aa 100644 --- a/arch/arm/mm/idmap.c +++ b/arch/arm/mm/idmap.c @@ -84,8 +84,15 @@ static void identity_mapping_add(pgd_t *pgd, const char *text_start, unsigned long addr, end; unsigned long next; +#ifdef CONFIG_XIP_KERNEL + addr = (phys_addr_t)(text_start) - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) + + CONFIG_XIP_PHYS_ADDR; + end = (phys_addr_t)(text_end) - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) + + CONFIG_XIP_PHYS_ADDR; +#else addr = virt_to_idmap(text_start); end = virt_to_idmap(text_end); +#endif pr_info("Setting up static identity map for 0x%lx - 0x%lx\n", addr, end); prot |= PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AF; -- 2.43.0