From patchwork Mon Jun 24 14:45:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13709592 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53E58C2BD09 for ; Mon, 24 Jun 2024 14:46:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C325B6B03D3; Mon, 24 Jun 2024 10:46:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C08906B03D4; Mon, 24 Jun 2024 10:46:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAA146B03D5; Mon, 24 Jun 2024 10:46:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8C39C6B03D3 for ; Mon, 24 Jun 2024 10:46:21 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1718B1A10CA for ; Mon, 24 Jun 2024 14:46:21 +0000 (UTC) X-FDA: 82266057762.22.0EC4B23 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf29.hostedemail.com (Postfix) with ESMTP id DAA35120010 for ; Mon, 24 Jun 2024 14:46:18 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719240368; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ysfc+qqhBaHzes/1dOaOQS2KSsFUBeZujVhXDSK2WXI=; b=q9DGe0n1fV2Qr5FsuWXkFZMHUXj3CpLMmgJf4I0lbiI7mpvJrkOG6D6JFJCDu1Y+8QpPJw 6XKUp82oIH36Gsd7uVQ942Tuq8byFyT1JPx9rp6B+aOQBOeOwqVW4/7JUcTRFvLNaFQb7z J3vlJTuSfhAFez86CMvDp9GCPocsOD0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719240368; a=rsa-sha256; cv=none; b=lQlkrTwG0kn/3AKkf+ZPiDWF54fUSxqmUGP8/5uGqbEEX9VIAGpdCGF/2D8aFVXt05r78n soUoGJajUW449bIhTeUTCF0btuQFcJ/bBVSrZNavvVuMYjr7UoeI9G7aukJZpQ4XHtoz/5 Ngl/B/SF37Bgh0SYVtqGxSD/BWoKFQE= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4W79kf3dsNz9vFX; Mon, 24 Jun 2024 16:46:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EY7GCR8t9pSa; Mon, 24 Jun 2024 16:46:02 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4W79kc2jcpz9vF1; Mon, 24 Jun 2024 16:46:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 58A998B766; Mon, 24 Jun 2024 16:46:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id UIgShAoMAc_G; Mon, 24 Jun 2024 16:46:00 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.33]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C98B08B768; Mon, 24 Jun 2024 16:45:59 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Jason Gunthorpe , Peter Xu , Oscar Salvador , Michael Ellerman , Nicholas Piggin Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v6 03/23] powerpc/64e: Drop E500 ifdefs in 64-bit code Date: Mon, 24 Jun 2024 16:45:29 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1719240333; l=3405; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=A/9Ib78BLDVf4ZZ6WCRXnSh8JY4Xq2JsVQD062iffmM=; b=8FTQ/XsgpMtj8tgzx29zcK6osHbRp6R69N5CSdY5G3WPcnNxRDFIzd92IfJl3Nzuitx544sQK vPxDYhj/5R7C7L17nvs0ksxlDCGmc3LEDNqRLVKLi7vL27Et6NGMOVB X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Stat-Signature: k6jx5wsjtwxf3spry5no8m64q1bnswnz X-Rspam-User: X-Rspamd-Queue-Id: DAA35120010 X-Rspamd-Server: rspam02 X-HE-Tag: 1719240378-916110 X-HE-Meta: U2FsdGVkX1+BFNHlhiiXN2lqLcgQsrrMXn38CG72F8c98mRfGnEsz4eEPRX6JVfGzV7OcuHVvLE6ERNn6QV1D2VsNj1tntbnf3MzFZufnU0tABkdbxgVyZSlHJBT6AZYiKX0BeJA+QnBwEiWMyu7vhvhH/l0DZDUIa949gh18AtpTw117OGYiaxJUPohKcrXndj49TTJNr2L6EQHU4GWl0cl8lEiLo3NRMU+O8+gUqmW7akxDa0wOxd7fk1EaRD/lLbVItrLylPHXANqUVmks58/Bw99hXELuWsITjH/NnkgK0Pm1fdcIU2cAaZwSIYuNw3aYUBHOcaQvPB2yfGkgmBJlJpUo7o+CHKKtexTCzkiHEHmp4J1YdR6xUCdPaol/WicdILp7zly06fsVRFWy+hRuqoyWH8QpAzP1k4AvJRKBYPkNGQWlCCS7mKXlgZjd3tLXerKApQ/nvudSL3Bq7W2GZ+tNUmfehtEjFCT7BFC0O5U7JM4YhIX+RLUwfgxF6Js6W6PpUVaqA9R0ZxoI6hSnJJPPSE3lWsievuZvtFRhspn82hdByomHolvwXFSH/XFGAgkIi/ZJen1XaZ8g0iNpsJ6XDsGhG+2wMudjsWDjPT6AV9YUSMPwSi5On3Spu/6GxUtxSlAEUMLSlLJJzsvkGYSx2B8HIYJHt/Xh/gu26lUv1Zf+dYFSbVI9cA1bKml6Or80C69sX+dxn+PwMhojF7nOAvh0lP1qBaTiJdsWCIjDDLDRv+5UUYQDR70xAC+8umN3YSHUmzsMyizRQppy5UMd7QgIkMzOS7swJadWPNGYOmTgLoInkDyFtLW1KYFT5uz2aC9Sp1/tg6Y/40nlqqLbL7QTnP+vJxeKNoHMe3WA7MQrSQCVYXdYo9OiA+XnS9OLDGCOpOoA3bmg4vl39cB+RCkxe0i6eRj5e5D/q231WrX6oc37f+r4WYcQR/OJlkvh6JVgZ0Qu1h zLO1U3w4 GXB3Eq3nBie2h/Yzp0fp1B/lThOKYeP+BurxlwdQuYe04T6FZCfvW8zLKeWOtS9sFOiopkowFjVskPq+ameNQJNcHrY4FYL0I5xvjSL8xrq8xoWNftLNF2cp0Fa2gK7yQdiS1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Michael Ellerman All 64-bit Book3E have E500=y, so drop the unneeded ifdefs. Signed-off-by: Michael Ellerman Signed-off-by: Christophe Leroy --- arch/powerpc/mm/nohash/tlb_64e.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/powerpc/mm/nohash/tlb_64e.c b/arch/powerpc/mm/nohash/tlb_64e.c index 7d5506d23eab..9db85ee9ba5b 100644 --- a/arch/powerpc/mm/nohash/tlb_64e.c +++ b/arch/powerpc/mm/nohash/tlb_64e.c @@ -85,7 +85,6 @@ static void __init setup_page_sizes(void) unsigned int eptcfg; int psize; -#ifdef CONFIG_PPC_E500 unsigned int mmucfg = mfspr(SPRN_MMUCFG); int fsl_mmu = mmu_has_feature(MMU_FTR_TYPE_FSL_E); @@ -151,7 +150,6 @@ static void __init setup_page_sizes(void) goto out; } -#endif out: /* Cleanup array and print summary */ pr_info("MMU: Supported page sizes\n"); @@ -180,13 +178,11 @@ static void __init setup_mmu_htw(void) */ switch (book3e_htw_mode) { -#ifdef CONFIG_PPC_E500 case PPC_HTW_E6500: extlb_level_exc = EX_TLB_SIZE; patch_exception(0x1c0, exc_data_tlb_miss_e6500_book3e); patch_exception(0x1e0, exc_instruction_tlb_miss_e6500_book3e); break; -#endif } pr_info("MMU: Book3E HW tablewalk %s\n", book3e_htw_mode != PPC_HTW_NONE ? "enabled" : "not supported"); @@ -217,7 +213,6 @@ static void early_init_this_mmu(void) } mtspr(SPRN_MAS4, mas4); -#ifdef CONFIG_PPC_E500 if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { unsigned int num_cams; bool map = true; @@ -238,7 +233,6 @@ static void early_init_this_mmu(void) linear_map_top = map_mem_in_cams(linear_map_top, num_cams, false, true); } -#endif /* A sync won't hurt us after mucking around with * the MMU configuration @@ -270,7 +264,6 @@ static void __init early_init_mmu_global(void) /* Look for HW tablewalk support */ setup_mmu_htw(); -#ifdef CONFIG_PPC_E500 if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { if (book3e_htw_mode == PPC_HTW_NONE) { extlb_level_exc = EX_TLB_SIZE; @@ -279,7 +272,6 @@ static void __init early_init_mmu_global(void) exc_instruction_tlb_miss_bolted_book3e); } } -#endif /* Set the global containing the top of the linear mapping * for use by the TLB miss code @@ -291,7 +283,6 @@ static void __init early_init_mmu_global(void) static void __init early_mmu_set_memory_limit(void) { -#ifdef CONFIG_PPC_E500 if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { /* * Limit memory so we dont have linear faults. @@ -302,7 +293,6 @@ static void __init early_mmu_set_memory_limit(void) */ memblock_enforce_memory_limit(linear_map_top); } -#endif memblock_set_current_limit(linear_map_top); } @@ -340,7 +330,6 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base, * We crop it to the size of the first MEMBLOCK to * avoid going over total available memory just in case... */ -#ifdef CONFIG_PPC_E500 if (early_mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { unsigned long linear_sz; unsigned int num_cams; @@ -353,7 +342,6 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base, ppc64_rma_size = min_t(u64, linear_sz, 0x40000000); } else -#endif ppc64_rma_size = min_t(u64, first_memblock_size, 0x40000000); /* Finally limit subsequent allocations */