From patchwork Mon Jun 24 14:45:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13709628 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 A30C6C2D0D1 for ; Mon, 24 Jun 2024 14:47:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30BE56B00F4; Mon, 24 Jun 2024 10:47:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BEAD6B0202; Mon, 24 Jun 2024 10:47:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 135F46B0187; Mon, 24 Jun 2024 10:47:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E4EF06B00F4 for ; Mon, 24 Jun 2024 10:47:07 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 98C3B410A1 for ; Mon, 24 Jun 2024 14:47:07 +0000 (UTC) X-FDA: 82266059694.19.24E2E26 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf02.hostedemail.com (Postfix) with ESMTP id 79A388001E for ; Mon, 24 Jun 2024 14:47:05 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; 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; 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=1719240419; 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=akZqsHNk9hsNW3yNSXiLyiAevtX1kI8jjgMPlRwGh9mw6Bz+iiD5sRxbmz3hFE2MM7DJ8L 3AHF3TrWP4diJ5PQ2bL7vhDCvc6+5O94DDXb5G73UK+N8jKVITf1aeg6rL2gltWjIJ40pR U9XRlL+xNIQAZmPIoMPstiMi0zLT+xM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; 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; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719240419; a=rsa-sha256; cv=none; b=mQ7wqJyCzBYvxAB6SU2i5J9bZDrASTTiWXRX4ovYOwZ68OCYB/yauCuUgVkzsOdNXUBhv7 XABcEOto4funqV9GXA4SPNTw2gwLXDZUncbvG3UlKOFNKWT4jmb+M4zelUnt0r/6+6eFgc ByYPdeHEYDBEpGOm2x4h7X7zo5rILew= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4W79kv2FN4z9vFM; Mon, 24 Jun 2024 16:46:15 +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 XyoFJLzfiuTu; Mon, 24 Jun 2024 16:46:15 +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 4W79kk4PyDz9vG4; Mon, 24 Jun 2024 16:46:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 937398B766; Mon, 24 Jun 2024 16:46:06 +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 4a8728aM7DXV; Mon, 24 Jun 2024 16:46:06 +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 050818B763; Mon, 24 Jun 2024 16:46:05 +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 14/23] powerpc/8xx: Simplify struct mmu_psize_def Date: Mon, 24 Jun 2024 16:45:40 +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=1719240334; l=1334; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=foRpSg705p76Fv1R91+1LawwFjSx303hjdxd+UuPeuU=; b=mwMUq2Y2c5ye7WW6fiTKSS3ln99BJVhVuNez0/0J7hzBMWwNcS2TTJru9TXiKOvNj9SrhELAk sJOBewBlTFUAiSpMGk9ALTg3dCwTPTNXgdU0I/1ycLDj6BJxAInura6 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 79A388001E X-Stat-Signature: 4r8zwszszicqzikk8gs44q5b4mpirdsw X-HE-Tag: 1719240425-323470 X-HE-Meta: U2FsdGVkX19rLQc6nMAGacSr7UuYGVpeTCICUB48qzIJJ8tsumCQT82lPyxXItr8oFzd+dKAemrPGoWYh7HCDZtSTEczgK/H8MeYm7kL/WzwgQ6DEl89Mc6ka1MDiDh4xs4V5OOclMmfFBH+OQHBfo6oUCyHKLYh1D8gFf86FIQM3ddHxCw5X8jNlhf129Fmjtg9WNGqRUuGRPVeHKzprrwVycbOTJuKT/dXOuKe4qsa57OsDv6xbfI4tS8qBK8X14uStIS4tRvcoGNyHDoc4uxXQf4WFcZUvODwvLJmGAhW1YT7ddMZrUMZcU4bwPqvnxdX4/8+xQFpoxSxK+lyTrBZ5ekBC5VrhH4IS2hpg5XnINLywND8yKZ54XhOB1sUDzothaPagqrZK80bKMzYppea8FT0ePwM6nQgEciIodnr3sywhX6OLC/F4blHCkFgXu+n1K+dMSPT1rXxQj3yBgLmAbRS+M0vv2QNjqnrotdapZPf8+DV3hYtiTNgocN8qa2Id521ZTXCqqYz1Dt25OQ8fYeuNWNb0A04nclUonTPFcGXtyyNQ9nF6yorMyi92NcUxC54ENeREbvkSbmKJ1eKT8aw3YxOiozwM4/81v30cncQVDgcULRGXeEtl/OfdzL1XxRZ/XpIVAjpi0GVRsDs8uqPFeCFflPn+PbBmUU/OT0INl/cDuYnxoc7Rn0e+CdncFplk0v6t/Th2UEy9JbjF5mbYX7wWT9p5H3RD3tN3OFKhbcXnd0KfcFOyFM9wbhWDyYLSQOvZ0N7Fo8FhZXNrZlFVEcj02un1ysYsB9IxoBcZARaNiKqIRy9BJwN4Qu68Y/7S8ugHuETzuVzl5gTjGh+JmfK/ghn6RD7V4qWVCLA27cs0dw9r8ypsZYCd3q8ctOQDZpOvGVa8IZdzXbjyfp0u0KENYFFHew1kwL9yjITyz/+4MkrkIvRz3rBiTnmG+GBKUoJefPHtkz VYdjLVhR avGQxV9t23WwSMm9Pv1eSXOm1ssqNgNEEHZ17KH/mC04Zp9dfscO75I6zoIsTvggKrgkK6ddV8Hb3/8QiRGPZyLOm8HThqjCdAzOKCbCuhkVUYPxZ9XuOrBtWuO/lw/m93mtxa+426QgpxeyVNYfbIOI8VnhrmThHd/0fLuKgZ4+Kr/k= 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];