From patchwork Fri May 17 19:00:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13667323 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 1D694C04FFE for ; Fri, 17 May 2024 19:01:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4D1F6B00AD; Fri, 17 May 2024 15:01:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FCAC6B00AE; Fri, 17 May 2024 15:01:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C67D6B00AF; Fri, 17 May 2024 15:01:12 -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 6E8636B00AD for ; Fri, 17 May 2024 15:01:12 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0BBEC140440 for ; Fri, 17 May 2024 19:01:12 +0000 (UTC) X-FDA: 82128805584.08.4E21D54 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf01.hostedemail.com (Postfix) with ESMTP id 0245340015 for ; Fri, 17 May 2024 19:01:09 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.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=1715972470; 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=slOd7gyMvbTc3ttwIArWCrsyyMIVbzvrVgWsOzLb+y4=; b=AxmeZvP2SqW1Qmn8vhlyi82ni2fFeepnarNhA75QkzXPjXZE/UcoGGN4JXwMcwPTGZ1et8 Lht6bHx9o1HSuHbYQfSVFd88qb299HDOTR3f2G7+bvFCfkXTuYf2hvKy3FAJuS186ecmvG w0m3wj6U+B/8L2GssM4diD4qG1ld9Nc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715972470; a=rsa-sha256; cv=none; b=QRvjxT2u0icILtplrfEZtKgKCltH/Tcv56B4qKWYwlYUmkdYJqpvn8llwPbBMwPjSTvV3r trHrjoQEjcQsXPAgThJqd4f8M4mVcbyMGT23RskkLekk0u5d79/NLHwIo/SRtPJZR6IOhf /vdueg60XnfNZs5Uww9g4kF5IxXbQ+o= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.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 4Vgx9b14Wqz9tCB; Fri, 17 May 2024 21:00:19 +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 awkweTb108lI; Fri, 17 May 2024 21:00:19 +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 4Vgx9R4Tj5z9t2k; Fri, 17 May 2024 21:00:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 957818B775; Fri, 17 May 2024 21:00:11 +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 xdfh3cHWQ4DC; Fri, 17 May 2024 21:00:11 +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 16AE48B766; Fri, 17 May 2024 21:00:11 +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 15/20] powerpc/85xx: Switch to 64 bits PGD Date: Fri, 17 May 2024 21:00:09 +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=2171; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=S24pIBxGP2mbrQFGO3lIOuFe18XifxlaeypwhWa5OmM=; b=dq4KYwp67s1XoUtlQUnziM5iWCqv4B+5JoZKA8fii7u5shKTuks/fAZJdGLz9mZklcw01TvVi NVxevrzLaMuCdgrWuh0m4GD4H5Aa8EYu47sl/Pn0TX/xCXEgTOVG6Uy X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Stat-Signature: tdz116i5mffu51n9xrxioykptbya6gtx X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0245340015 X-HE-Tag: 1715972469-473300 X-HE-Meta: U2FsdGVkX18TTXxAHVHfWDN7llrmyPU94AhuMszChuIXZAxDXDVMcv4DPF+6YnfFFqxYq9EtAF5eXPMIDNk6OazfsmAcZMNr11e85Nwfn40IpPs0bAak/HbKpqi1Jjn2B6kFj8uqCONaCeTk4mTBV7OMw/oilMXBhVCCijrvldedBo6ZaowTTqjg0kuvXgUd+U5U+fLlKGuf2yzUuYtzOuVp4yYezlCdNzBUK9a76nR1TsrsfSpqPaZDOT01vpiWjSl7fe/m7JQKrBk4tKylK6SeLJga+rGG+zl6KO4pxEIQ+/qSertllBfEyewEo1ghNJs8so+ksLxBZ6EQ8w3WJz6LoL2mjZQs4rrWvyIs2AoEpGcDrN+2g+Z0YMsdol2dyMlfnekswf4rjKVAJDEB07CNiRhWHuPrdb0PH5AYnHM3jo/CPNM8/oMrYe/RKw1Oxniz9WSSR3AxwLtNcPsOSuJ3X0gplXOdTObimNA++XmEafHPVaQF6cMv0MMXnZHV3fgLNKLT7iFDVDVOry0h3QglzbOR0cO6DwmUJCRnXiID10F98OK0GgC8iqYQZI8SshWnrdyVFLNLTGtVwWpMrozoABbFE5bmbfKEgFNSdTQWkW5ZVLwUpwpGZzijrrEW0S9yBjEWszWWy4mVxoro5qgcnI/gM3ETSM38TVJyV5KidGWEV9BCZ3hhD/8kUonsmIYESAl4lMinO4lFYDfMah0LrQNA8Pxn6TbKjRBaDvk9Duf0lqJu/u8ATZeInu6EcW+Nv2XArKwGjHt62Kh/LuQ48+HIjIC6uLfGqG83wgb64oSdcDx6jNNJDT70HA3V 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: 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 */ \