From patchwork Mon Jun 10 05:54:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13691513 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 EA111C27C5E for ; Mon, 10 Jun 2024 05:55:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86D776B00AC; Mon, 10 Jun 2024 01:55:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F5986B00AD; Mon, 10 Jun 2024 01:55:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66FF16B00AE; Mon, 10 Jun 2024 01:55:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 40C1E6B00AC for ; Mon, 10 Jun 2024 01:55:51 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 043DE1A0CEB for ; Mon, 10 Jun 2024 05:55:51 +0000 (UTC) X-FDA: 82213917702.21.8894B79 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf24.hostedemail.com (Postfix) with ESMTP id CC936180003 for ; Mon, 10 Jun 2024 05:55:48 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; spf=pass (imf24.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=1717998949; a=rsa-sha256; cv=none; b=hymP2NFe8CA2ofbZLe+d8lxrM0LUmr6uWFiiRaanCRRe5iiyONXFAQVmPOqr/oFrUWzfe1 1v7neFVhIE0lTX6nDQqFe1MjwQ2Eik77KwXbmfRqcvm2oS2LTPHi5CPyA8HyD0ZSwYwfmw 1KiDLwUnD4T7Q90tLKVRj0xSb134AP0= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; spf=pass (imf24.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=1717998949; 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=RTSOW/EbnmE8HR3k1nhtRsaSJvc+qkVW57PW03rpQg8=; b=Z2/Rt5IrYtbcG2JaC5YPVMpKcrmLGdG+9gZ2AgO8sAbJt23GxKWKcwl37s/+onOgy3cen/ 9LfEUsHi/1iVOTi76+0zwZFxbk7joUkQiEqfkpRxrlBH3UwR1AScmka0fo9Fni6LjXYtVP zFWeyso/ZNDu04ueGlle+H/v/yKNBF4= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4VyLcX4pfLz9v5s; Mon, 10 Jun 2024 07:55:08 +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 oDUislhVtwik; Mon, 10 Jun 2024 07:55:08 +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 4VyLcL52DXz9v6D; Mon, 10 Jun 2024 07:54:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A8A2E8B76E; Mon, 10 Jun 2024 07:54:58 +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 PyXQSU5-K7sf; Mon, 10 Jun 2024 07:54:58 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [172.25.230.108]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 834C98B764; Mon, 10 Jun 2024 07:54:58 +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 v5 11/18] powerpc/e500: Switch to 64 bits PGD on 85xx (32 bits) Date: Mon, 10 Jun 2024 07:54:56 +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=1717998887; l=2287; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=s4/AO36tt/CSDTJwqMkp0Ne29mDvmColJNi/FwYddUk=; b=mchxKAuqRvjFYDgiBDjvxFYzcdSlrJkxgoFKrmqyi05IMpoH75BRwcyKNjewV2rRlD8PVMU9m +B6OVQSgl6VCsgYYdUJxeiw47CC+lOBVbr2wlHtlGaCWkBk3Kh9bjF5 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Queue-Id: CC936180003 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: ii9zxeqziuyk7sakf9y7yaryp1ayus1q X-HE-Tag: 1717998948-799132 X-HE-Meta: U2FsdGVkX1+dEN7McyVPpkPWK5CvcxJBLQHQp8bgau4VAahtcbQfywcgRmTLh0jxLUE4Hnu27GgC1zzMHXRePFnmJBYvM2yFN9BUSj8xcY/gaSF25h87j0/Kd87NLC2/3eNhvU2S4D1qhk920rL3KuCUCjvzE6Ak+/i3WL2/i6L74J4/oaXNum4UU8ryWfdgRw5Xq55Z+6KsvvWs9syjpDwd+b4C997F51pThUyi2zI0/GnQUGiUcCRVqQf6LntR7VQRL8hCmAE93cIDKwM1XgTyBkzZUrfDATqP+kw5KG+7xFOJ5pKeMoQuqHPh8PSymhclEdv/q7K8HfrIdc6QisPfun1HA+CiFpFl2N67v4dUAK5yBnoAAA+iQ2hSYGDMdEEc2RPJjUkgG17mkuiQRM0hX764Yd2j+TRSzs5u7VwfGEvQdS0vadMUIflxDs6Oq9UJS0BXrNawd1BsJGbM73tmLE6Jxw5w8bnAiwAan4pWENMfazhK9/EBm0sklE478nMTMkjAqIc8VZznpja4Jwa+vRH3WRz7HPrCWbh5/xSS5GbLO496VzFwNXUdiHcuT4tLmXBEiZsevRkxotIiw5zozD1HrOYdbWb4b4fTXlrAAJv8y3nNWLWMb2uKze9aUMQ34PcDNIRcfusbE6P3EuSInONLQQFWGajxTK+FxOCalDXVebogWzjLlImSHcc2YZ/6al24qWH9xe4qgs9p5zy1OAarh+EGTvw/6BXeYzW+Pyl4rGKIu1S1L+V6GrAuSJVD03D57VGzY9yHX6KKTnA4khFx+Aeil2hmu5/jUDFFgt5MIBmwgMS+QkdM+E/tO5BcP4ihH3tE3erpZI+zsgxnSYO/1oC7iTR65jzbyyHzDV8dOwSihQfoKHseD++S5Jnj8GWehCDRrab3KQ68d5YgrCjM8MQamoAAzAFliTTDE97OwrNwT7yQ9bjG/MIbsrjXW7c9BQRSfKu1PAy PFHGJE3c I8+LRFxTldOG9Ts83uNVD5RHLqdh5/r/S2kZJKQ5FMCeST2+0LqNcylbJ0Kxk3DMvri3pZkCZZJaYHXnO7JoiRMXZG5XqxopLX4yxqRDYA0KBDjQQYz3efgOlMgFqSrB1v/Ur 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: At the time being when CONFIG_PTE_64BIT is selected, PTE entries are 64 bits but PGD entries are still 32 bits. In order to allow leaf PMD entries, switch the PGD to 64 bits entries. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/pgtable-types.h | 4 ++++ arch/powerpc/kernel/head_85xx.S | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/pgtable-types.h b/arch/powerpc/include/asm/pgtable-types.h index 082c85cc09b1..db965d98e0ae 100644 --- a/arch/powerpc/include/asm/pgtable-types.h +++ b/arch/powerpc/include/asm/pgtable-types.h @@ -49,7 +49,11 @@ static inline unsigned long pud_val(pud_t x) #endif /* CONFIG_PPC64 */ /* PGD level */ +#if defined(CONFIG_PPC_E500) && defined(CONFIG_PTE_64BIT) +typedef struct { unsigned long long pgd; } pgd_t; +#else typedef struct { unsigned long pgd; } pgd_t; +#endif #define __pgd(x) ((pgd_t) { (x) }) static inline unsigned long pgd_val(pgd_t x) { diff --git a/arch/powerpc/kernel/head_85xx.S b/arch/powerpc/kernel/head_85xx.S index 39724ff5ae1f..a305244afc9f 100644 --- a/arch/powerpc/kernel/head_85xx.S +++ b/arch/powerpc/kernel/head_85xx.S @@ -307,8 +307,9 @@ set_ivor: #ifdef CONFIG_PTE_64BIT #ifdef CONFIG_HUGETLB_PAGE #define FIND_PTE \ - rlwinm r12, r10, 13, 19, 29; /* Compute pgdir/pmd offset */ \ - lwzx r11, r12, r11; /* Get pgd/pmd entry */ \ + rlwinm r12, r10, 14, 18, 28; /* Compute pgdir/pmd offset */ \ + add r12, r11, r12; \ + lwz r11, 4(r12); /* Get pgd/pmd entry */ \ rlwinm. r12, r11, 0, 0, 20; /* Extract pt base address */ \ blt 1000f; /* Normal non-huge page */ \ beq 2f; /* Bail if no table */ \ @@ -321,8 +322,9 @@ set_ivor: 1001: lwz r11, 4(r12); /* Get pte entry */ #else #define FIND_PTE \ - rlwinm r12, r10, 13, 19, 29; /* Compute pgdir/pmd offset */ \ - lwzx r11, r12, r11; /* Get pgd/pmd entry */ \ + rlwinm r12, r10, 14, 18, 28; /* Compute pgdir/pmd offset */ \ + add r12, r11, r12; \ + lwz r11, 4(r12); /* Get pgd/pmd entry */ \ rlwinm. r12, r11, 0, 0, 20; /* Extract pt base address */ \ beq 2f; /* Bail if no table */ \ rlwimi r12, r10, 23, 20, 28; /* Compute pte address */ \