From patchwork Mon May 27 13:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13675250 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 B61C2C25B74 for ; Mon, 27 May 2024 13:31:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A9E56B00B0; Mon, 27 May 2024 09:31:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45A086B00B1; Mon, 27 May 2024 09:31:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FBF96B00B2; Mon, 27 May 2024 09:31:03 -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 1105E6B00B0 for ; Mon, 27 May 2024 09:31:03 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C100516146D for ; Mon, 27 May 2024 13:31:02 +0000 (UTC) X-FDA: 82164261564.27.185BA89 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf11.hostedemail.com (Postfix) with ESMTP id 9F2134000A for ; Mon, 27 May 2024 13:31:00 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.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=1716816660; 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=GUwsHog4uuWwb0OErwYz1eYxTd3EDOsz1QgWZ06a0N0=; b=vB8hxlYFViQI7vVA+5bunjiOHghVeQP7qWUsMySsT1Qx0/ww0pl+W7VaO01oS/IWVXq6bg hJIUg9pPMucrvVg51PuOSsnyEbWjGIRhahDDUwMvokGY/LxBg2KXP1lxHFvAeWC1HrjN69 aqHK1pyT3nLRzlc5jM26hAEl/eXL99k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716816660; a=rsa-sha256; cv=none; b=2xA+lRDxWBqkGsi6jeUxyRNIDR1kV3f/IqF3alaNEbNiflttGLEZARON/wks9K1ziulX7t L01Lt0eqxVW1VwFS/vAwvpRJqguvJTWBEo/nZ/f3T5UE0crGbVH3tAeDl7aB87a3jQQrOm IpzQSFIW+Dx24mfIM5+3F84EzXOr/7I= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.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 Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4VnxNj27dVz9tHF; Mon, 27 May 2024 15:30:45 +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 OMtrQV6-bPEi; Mon, 27 May 2024 15:30:45 +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 4VnxNj1W8nz9tC6; Mon, 27 May 2024 15:30:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2F2978B773; Mon, 27 May 2024 15:30:45 +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 j18ynURuvhtH; Mon, 27 May 2024 15:30:45 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.232.49]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 318758B764; Mon, 27 May 2024 15:30:43 +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 v4 10/16] powerpc/e500: Remove enc and ind fields from struct mmu_psize_def Date: Mon, 27 May 2024 15:30:08 +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=1716816601; l=3777; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=GvUuKmINqllZ54PyQ+lDpy16CYLzBdm/Cr1rg49spF8=; b=RxMHKhJJDAP5VpYsyWZSt1EFiYcmwhH/8hOQ85y473bMx94B2aAMvyWdPD8Ua2+9iVSiBAblO I+3pg9fCTWWAX53sbwzZ4ZdyOu8X7nryQzRKv38fQaDfVr2VNipKl4h X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 9F2134000A X-Rspam-User: X-Stat-Signature: 7r3mz1wg9e6memdf6ofm9c8bx7occ696 X-HE-Tag: 1716816660-364899 X-HE-Meta: U2FsdGVkX1+yKDmMejhoL6L91OztjFzc/JhlkL9x4So1l/91r4IXZkmv3W7+P6TuduWUQM4ZJxnGFbrphoD2TTN1ZpS8M7cnhx7a2pYmjYJA6WMGNJ+GUN/WcNDdpep/COpU24Xpr64q9WXgxHLFaeSAhMP3NomO89qkfKY63AyApEGV2M6yPx0QAO8FYhIth2DxO34QpdMJdwwI6zqM+TeWh5/PWHXhNRSfLnwIv00IFufBNgdsGTgbyvsQLYHlNgJce7Ay69mDvwZ1I6YWkj4NiQCwqdjet/V9HX/pF2l0tGFFo6TBwZX7PiIqkqoWlD+Eb/KdTmEaE9Rrat5OBBxzhRIVCX+nggvSRBwXDzdnVywNpUH6Z9pWNrXD67T7KFYpCT0UW1lFlmtusLSPPVBj0eh7rpR5FDscud7kInChJuX5xDUHr2kxRCbnPv7T3U2YImxOM9ojrNiZtmpd8ItwW82HhuDHd/bKauiCEBIYOlGhw97v2AOgGzkRg919Z9TK3Ypgr0tGUnsFZr/iepz5e6w906xZKTc9mE0Pc3KfYoGGTJQRgH0BSXgUGJEVt1MpinStOI2tM2reRotOB5V/o4tKZdIUeIlobVEhaO3tyGUKvNqxi4/WB5kUw2HhAg8ogcc/r+3hIV1cnsklo5s3X8a6KcCjrGZk6lA/410k68kOlK0bQBTcnThr5AYx4jYQRPdjH+Amc28ctGBpWhJsj0YBfm+aRC8WevGgyBw5Z+kLOI5bZUwk178agAllpglNM0TAXDNf+RaBHVFB9Ou7f8L+SQHdUVXIA9yQoByn+3rRx4yXWP7NfCSWX7dRyn53ottPaI8PJ2JLG0rliaFY6M7q4CZPNDR1zD3hV+l4lTzZaYjKLAo9aWs4EPiXtnA0c5+gJ+436JGYnJ98o1VsQaOKY25Bcgt72tNEKMpMVG+xOPE7ubRBybq7HJDOAXSfuQ+oPHtBfwfNYL3 LlCzI5Pp 6oduPWwWXMcsiZvVYflhMj8hynUwreuy1ZVKJ09Fum7A2IU8rjCj/Nhp3sa6RnCHv00Fsgqv0C7voRppPJoW2JuIEZARtzhRm0YWp8f0RqDEL4/o31IP+6wlWpILR5erYSkUNBI9lMDAotE6vNKsI7/L1V50YHiaJ+XnYPte8iVbcHbA= 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: enc field is hidden behind BOOK3E_PAGESZ_XX macros, and when you look closer you realise that this field is nothing else than the value of shift minus ten. So remove enc field and calculate tsize from shift field. Also remove inc field which is unused. Signed-off-by: Christophe Leroy Reviewed-by: Oscar Salvador --- arch/powerpc/include/asm/nohash/mmu-e500.h | 3 --- arch/powerpc/mm/nohash/book3e_pgtable.c | 4 ++-- arch/powerpc/mm/nohash/tlb.c | 9 +-------- arch/powerpc/mm/nohash/tlb_64e.c | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/mmu-e500.h b/arch/powerpc/include/asm/nohash/mmu-e500.h index 7dc24b8632d7..b281d9eeaf1e 100644 --- a/arch/powerpc/include/asm/nohash/mmu-e500.h +++ b/arch/powerpc/include/asm/nohash/mmu-e500.h @@ -244,14 +244,11 @@ typedef struct { /* Page size definitions, common between 32 and 64-bit * * shift : is the "PAGE_SHIFT" value for that page size - * penc : is the pte encoding mask * */ struct mmu_psize_def { unsigned int shift; /* number of bits */ - unsigned int enc; /* PTE encoding */ - unsigned int ind; /* Corresponding indirect page size shift */ unsigned int flags; #define MMU_PAGE_SIZE_DIRECT 0x1 /* Supported as a direct size */ #define MMU_PAGE_SIZE_INDIRECT 0x2 /* Supported as an indirect size */ diff --git a/arch/powerpc/mm/nohash/book3e_pgtable.c b/arch/powerpc/mm/nohash/book3e_pgtable.c index 1c5e4ecbebeb..ad2a7c26f2a0 100644 --- a/arch/powerpc/mm/nohash/book3e_pgtable.c +++ b/arch/powerpc/mm/nohash/book3e_pgtable.c @@ -29,10 +29,10 @@ int __meminit vmemmap_create_mapping(unsigned long start, _PAGE_KERNEL_RW; /* PTEs only contain page size encodings up to 32M */ - BUG_ON(mmu_psize_defs[mmu_vmemmap_psize].enc > 0xf); + BUG_ON(mmu_psize_defs[mmu_vmemmap_psize].shift - 10 > 0xf); /* Encode the size in the PTE */ - flags |= mmu_psize_defs[mmu_vmemmap_psize].enc << 8; + flags |= (mmu_psize_defs[mmu_vmemmap_psize].shift - 10) << 8; /* For each PTE for that area, map things. Note that we don't * increment phys because all PTEs are of the large size and diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index f57dc721d063..b653a7be4cb1 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -53,37 +53,30 @@ struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = { [MMU_PAGE_4K] = { .shift = 12, - .enc = BOOK3E_PAGESZ_4K, }, [MMU_PAGE_2M] = { .shift = 21, - .enc = BOOK3E_PAGESZ_2M, }, [MMU_PAGE_4M] = { .shift = 22, - .enc = BOOK3E_PAGESZ_4M, }, [MMU_PAGE_16M] = { .shift = 24, - .enc = BOOK3E_PAGESZ_16M, }, [MMU_PAGE_64M] = { .shift = 26, - .enc = BOOK3E_PAGESZ_64M, }, [MMU_PAGE_256M] = { .shift = 28, - .enc = BOOK3E_PAGESZ_256M, }, [MMU_PAGE_1G] = { .shift = 30, - .enc = BOOK3E_PAGESZ_1GB, }, }; static inline int mmu_get_tsize(int psize) { - return mmu_psize_defs[psize].enc; + return mmu_psize_defs[psize].shift - 10; } #else static inline int mmu_get_tsize(int psize) diff --git a/arch/powerpc/mm/nohash/tlb_64e.c b/arch/powerpc/mm/nohash/tlb_64e.c index 053128a5636c..7988238496d7 100644 --- a/arch/powerpc/mm/nohash/tlb_64e.c +++ b/arch/powerpc/mm/nohash/tlb_64e.c @@ -53,7 +53,7 @@ int extlb_level_exc; */ void tlb_flush_pgtable(struct mmu_gather *tlb, unsigned long address) { - int tsize = mmu_psize_defs[mmu_pte_psize].enc; + int tsize = mmu_psize_defs[mmu_pte_psize].shift - 10; if (book3e_htw_mode != PPC_HTW_NONE) { unsigned long start = address & PMD_MASK;