From patchwork Tue Jul 2 13:51:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13719690 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 AF26BC3064D for ; Tue, 2 Jul 2024 13:52:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42D626B00CB; Tue, 2 Jul 2024 09:52:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B5946B00CC; Tue, 2 Jul 2024 09:52:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 257836B00CD; Tue, 2 Jul 2024 09:52:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 03DE56B00CB for ; Tue, 2 Jul 2024 09:52:31 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9124040155 for ; Tue, 2 Jul 2024 13:52:31 +0000 (UTC) X-FDA: 82294952502.06.B52ABDA Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf07.hostedemail.com (Postfix) with ESMTP id 6E0C540017 for ; Tue, 2 Jul 2024 13:52:29 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.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=1719928327; 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=Ry7wjRmAbrCChnbrq+gG2BW8QdTQw9qwIvifIWQPxK0=; b=zTc5OX45+V22aK6SW5dKy6wLNRy8i702sh0rEifGZfleg/mi/j4b14N+3x8weZWzlAvkYA WzKd9g6yWLsgC33wrat21EoAlUqBJV/fsXtxddrIBe6mntKe+mQYodzjg6hX1rCRrinKuV sFLTzgCXtbOTvtYHr96EPb36fzvWq14= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719928327; a=rsa-sha256; cv=none; b=kQvPUJVwl87oCMOfiMBoByfayUp9Bp78+tIdonqzKykYqF99A2yjiCI6FxsQJwyKtz80Lp yyxVNLlXKlDT+Rfrrghxuc6E1NurcMstkTvG/N4YG00JJaxaA1QXmj6Eul3v26ttFQiWIo 8wcTE/hezMzpzZ7SEMEcTY65KJmWM1o= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.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 4WD48C2f56z9v6D; Tue, 2 Jul 2024 15:51:39 +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 WlZ9TyEo5Dgx; Tue, 2 Jul 2024 15:51:39 +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 4WD4844960z9v4J; Tue, 2 Jul 2024 15:51:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8AF8F8B774; Tue, 2 Jul 2024 15:51:32 +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 B0dbSiqMZunM; Tue, 2 Jul 2024 15:51:32 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.12]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0E1988B764; Tue, 2 Jul 2024 15:51:32 +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 v7 14/23] powerpc/8xx: Simplify struct mmu_psize_def Date: Tue, 2 Jul 2024 15:51:26 +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=1719928275; l=1334; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=foRpSg705p76Fv1R91+1LawwFjSx303hjdxd+UuPeuU=; b=7ve/BvHdIJxzyweKh0VcZc2SKlNEWuWVtKP7D0YWuJZRMM79S4BQXvO4BgF6GsEMy3tUx7KzS I3U/N1LXGBGCK2Kfv+EQRWRK3z5XCXLnsOZAeet8T5FniIfLbs8pKb7 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6E0C540017 X-Stat-Signature: 1w3zwqp4d8kxeftgfa5gggd6khu9hir4 X-HE-Tag: 1719928349-795347 X-HE-Meta: U2FsdGVkX1/bXFfqvLuh4aJlAzKvpL85CJPeyrGU/g+XSkzkBiFNDDxYlf6xptNStRQ+GcGKQCx4RXvJ2IRsywFHkW8pSGaIjKL7Mfsz4rl9/Gur58L6701lvAlKuJ0BR74nSWOxUjZAD+nyYokKp61NXHNwrqaux8RmGFfw5Cw0BFOYaVg4YwDWHJpHa+XqwARJkymycNb9da9G6fA8kMDtR+q98DQl7g9EtH9TVFtms5S7OcBQd5V0wfTVN1c1t4Y5oKUyl5luD+43T/Yz51t7eZtWQ1NHqVr35Um8YNwj0ZgC8ByA5vudiQME2WMHkFHQZ/mxZuX7zIEDF1HPZpdUr39GG3Fz0bFhxWotBdIwBixO9rvFTtBC63UlJFOtItfeNEHQbw2EtQQtQmBlxerMBohjieB8u2bETiyL1TEKSeCQ6c0s3vsPsYMlUk/2Y3R88RVR2C1GEQP/mKDCagrADO1X8mzN8ZHNChG4NQSxf099zUs3dhgaI4zVJRgXmVhGENWGHqc/R1IeWSHlDtA+LCJqxcubfJFTQu16JAJe/gMtmgf98cZ/10W4VBORTEInsPtDdH/HK+P7OIDrizrmBtp2NaF9+Bl9UQS12raOUlEDWPpSt+0oSw7AN5e5CBU++/EHAWYWr92lAGSiClfTL3sYEido3mIykJbTcqo4NdZHb0L4qI6v1+0eCMYnswHLB/sivdQ/5cgX9Mx84m1ONcZ00ArogcRkKvvivMIU1ZRQyk6Zp0+KejCnaCHneRmo+iwY0QTsiYGfbojBAs9Y4Tk8oWhGstK2zDDr05FIlRRe+BU9HgiucuR9k3qLYS5R3rxEPzmnrHjpGumuUMlHey8RuA7cAU37qK1kOtrqqdSeV1PIIuuF7Uqj758IdU6AhZvU3PZPf1ikTJHWiuMeetFmd7+alogUBHBHNThQr377ZGeodrNB9sBzIRuWJ9rNhtOZSsO55OJ+I3O HOber5ID W7G4jIPdJZ1+YgnJTungW0cAEWHrv1iFrvMQ15amNdaUvgJyjAh6Ks9k5EzjCaPKhYmcPyieb45JjsNrNG2v8fYmvB6HP3py3GKwvQe9XeTTvJId9u7Glj8yYRG30TUJjI1LcgqLmsAJaICj+vXB0Xlc4QDuKDqkj/01WQhZjs69Q5AY= 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: On 8xx, only the shift field is used in struct mmu_psize_def Remove other fields and related macros. Signed-off-by: Christophe Leroy Reviewed-by: Oscar Salvador --- arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h index 141d82e249a8..a756a1e59c54 100644 --- a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h +++ b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h @@ -189,19 +189,14 @@ typedef struct { #define PHYS_IMMR_BASE (mfspr(SPRN_IMMR) & 0xfff80000) -/* Page size definitions, common between 32 and 64-bit +/* + * Page size definitions for 8xx * * 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 */ }; extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];