From patchwork Fri May 17 19:00:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13667320 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 6AE0EC04FFE for ; Fri, 17 May 2024 19:00:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0AF06B00A6; Fri, 17 May 2024 15:00:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB8666B00A9; Fri, 17 May 2024 15:00:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D31536B00A8; Fri, 17 May 2024 15:00:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AC7056B00A6 for ; Fri, 17 May 2024 15:00:58 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6EF4DA03DA for ; Fri, 17 May 2024 19:00:58 +0000 (UTC) X-FDA: 82128804996.28.E27AFEE Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf02.hostedemail.com (Postfix) with ESMTP id 2F7AF80016 for ; Fri, 17 May 2024 19:00:55 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf02.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715972456; 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=TjDA7e1uyinwQlI5V2Bl4UhqOc0ICk9BzzShSqWEZSQ=; b=8AqoFRoiVBPM2rlPY8NRLY1ztG6BMlYEfeolHUAwyIy2EZs8DniJfbiDyZCzAw60dEY3Oc iNSMkScBZoX915UC5CtUVfHHl2sD5q6oUSchh/qciT25aHb1z9E3D4cUkv04P4Sk5mWQdq cTvWyl5qEjP0RySqhCTcE4GAYqOyF8I= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf02.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715972456; a=rsa-sha256; cv=none; b=TFmm5J/E+exHUxlG6PL8vUFQUxqQfzGt949fxdeaJo81FA+cCowj9A6O/u8U/+vYbOkAvz mK5XRvqphxSWzFTrXxjt2Rwtb4d0kByTMAgtVa456K4/ikLn39lw6HWVwfSmdOdprAj5Jq BJA7h0jHMES3bWOQ4Sn/9+wZXbZZK9U= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4Vgx9X0zDyz9sy4; Fri, 17 May 2024 21:00:16 +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 wHD1cnBBuEpX; Fri, 17 May 2024 21:00:16 +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 4Vgx9P72pVz9t0K; Fri, 17 May 2024 21:00:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id ED94B8B775; Fri, 17 May 2024 21:00:09 +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 j74iBzFKdD6P; Fri, 17 May 2024 21:00:09 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.232.121]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 66DA08B783; Fri, 17 May 2024 21:00:09 +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: [RFC PATCH v2 12/20] powerpc/64e: Remove unneeded #ifdef CONFIG_PPC_E500 Date: Fri, 17 May 2024 21:00:06 +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=1715972397; l=3490; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=DGNEwOqrZPDJ6RelPMWL/atODz81+xAm8V/8D54CzmE=; b=82BEvUxdn8ICjBdq8A7G9v2L3oUv4GZXqKIMA8sGAF7jH5d778KUHHvYbvAg1PoearWJjNtgC SOmb5SGtcAZBUlkI6VdjVJWJxfnjNtwcKB1yX+g2mykMaLm5ZxISUwj X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2F7AF80016 X-Stat-Signature: mpekf67o8rr4hrk8xqpd5kodtd34erj9 X-HE-Tag: 1715972455-635934 X-HE-Meta: U2FsdGVkX18w4OZHn9/4PkLVZXmkzXHXA5H+YFLTF8R5Wp0jlQMj6SXn9Gs+Sm8/02JxNQRkpueGfxUm9zG8ge2tRh3tMVSZ4gSayQ14IDO8EVxNA6ZOruqQGCDrox55eciqru0Ac22azpGnUWsEVGaE/fPIGVQYWuk/AL2J0mzVM6AJE9xeEhQst2tcD/ZA6txCDuwvGlSsrkL9btPQ1cAOBpXiVv7JTTqRdFcc1+bg8eB1RVXyDMCoaNhej8T1vjK0jm9ReOGcuyMlxnEFtcXHPBZ8IATVc17cogE43LsniedjTBtzNwzPwTWix+iEbgERCH8/J46JbxVf/+jZjMSGAjDnqODNi2OLNageg8Rpe7Ce5MZd5Jh2+L3eXGlvSHrv1ThTSJ+4vGsfx6HzfmwbNV9L2zWZ3EN0JmHKn73bEbqcyQIRaozfXzRGnmlIZAjzt78XrFns45j0+XjtIWqc88pLKLTckpFBJ2sabv24yEOW6559DFCUaPWSbIdSJFX0GPPYNwXCeUFOThUsj3H4Pf1svwoT0TeEl0Pjbgt7bBubEKSNk/OKn0wr5r/5dmBnuTR0odQkS4PQpG5h7PZIa+a8PlTFhg2W66S4ONaxHLAxmzqADfJCr3h1jH5oUuYf2aEOR+cVPmRqnUla/pugFYkVvcF5GUqNAu9otC6Z5Q3HwC7HDkUbeKOYaSIuTB83dQfXReMPySUrQ60fJOhLzuAhsM7AzcKKz1j47STc2KB+WmtWrrAu6hJCh8tBjNRlGaYt7SY6T/Nr0MYsHgsUrYmyXysuzK4jGDQkh6gUTfGWlodNZfzaPoulT9rP8/XggfqwdCDvMChl1XOjLIJVBzEO4R2jUWbl1XUiJ9/2MAJiohyai9KFiMcH7+Y71kiAI5kw1mrFWUZ1IdZ0O1szVzRJGkPD83LO4B2uIUFYvv3i3N1n2thWMKXJ1/XsZiPgGMjALCiWxQKMcJw rNGShDL3 L7XUb5+qcnrFBEOVhkaY8IFI+rzKg7kXNzUcSNZnRP0W7nwI/z14FZZr71hBnWsPWHclSaJlKxZTddTNYxIb73M/1gV81oB2WKRxPKJD46L/QirM3umlHop9295v7AR+EvH0ST77x9j8GXy1LduvnVzRVV8MMxlCWWulSLRovZNr/PEc= 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: When it is a nohash/64 it can't be anything else than CONFIG_PPC_E500 so remove the #ifdef as they are always true. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/nohash/tlb.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index 5ffa0af4328a..d16f1ef7516c 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -403,8 +403,6 @@ static void __init setup_page_sizes(void) unsigned int tlb0ps; unsigned int eptcfg; int i, psize; - -#ifdef CONFIG_PPC_E500 unsigned int mmucfg = mfspr(SPRN_MMUCFG); int fsl_mmu = mmu_has_feature(MMU_FTR_TYPE_FSL_E); @@ -470,7 +468,6 @@ static void __init setup_page_sizes(void) goto out; } -#endif tlb0cfg = mfspr(SPRN_TLB0CFG); tlb0ps = mfspr(SPRN_TLB0PS); @@ -547,13 +544,11 @@ static void __init setup_mmu_htw(void) patch_exception(0x1c0, exc_data_tlb_miss_htw_book3e); patch_exception(0x1e0, exc_instruction_tlb_miss_htw_book3e); break; -#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"); @@ -590,7 +585,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; @@ -611,7 +605,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 @@ -643,7 +636,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; @@ -652,7 +644,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 @@ -664,7 +655,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. @@ -675,7 +665,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); } @@ -713,7 +702,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; @@ -726,7 +714,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 */