From nobody Wed Dec 10 20:12:35 2025 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79D2C2ECE82 for ; Thu, 13 Nov 2025 01:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762998444; cv=none; b=JHW42NRw5579Zd5zvkaPeQJtWmhKMLUhq/zb8j1TgsVX9KMrHRk13wZE+uwLRaOTdRd2XyD37G8Z+bO4L7swRQkQPN5NBzZXrlEpFXasrbI42sE8voxOw6mwCgLB1exhxL1rJyAxH3hXaniSz3s8Ts9Jz+fGhpgCfffpAQE7zXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762998444; c=relaxed/simple; bh=J1/8A3IXTM9bzlcP42Q0I0NkjdkS9JJwgbBrPUlH8CY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UjFPXMKOfADB4IeUJf/Cew1RrLa8hK/emSagu2wum9byq80bZMTKAQEAa7qlMqQcw0ODu1VYPS/SPWgSfA6v3ChfHRdRCcgVJ9OZujFuBE72ORK0DdqGT6eQm4Fj85c9nSe1WA3Qclh+MUCohffrP4E00h+JOGaO7VCEzqAnyYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com; spf=pass smtp.mailfrom=sifive.com; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b=K516f/cH; arc=none smtp.client-ip=209.85.215.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sifive.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="K516f/cH" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-bc09b3d3b06so168844a12.2 for ; Wed, 12 Nov 2025 17:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1762998442; x=1763603242; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LCfGLyHTlwnlWI3FvQiRrpmgPRI/lUHNtrwWz9sKS0g=; b=K516f/cHWy/Yl622VfKBus6XAOT1LXjV+84YodxD/rTcjjp1DRgU98bx84x7lX1E+3 sz+x2y9BPBZN2+dKv+RwcSKsYK3ZHYr9Wn4usGBdnEBUHr1iFsnGXXuqdh101INphpxn ZPdvRH6cv09EQLdNtvYUOw+dxb+i8nzFtOcsVupJPShVt64Nulb3CCdMQvPtSn6Ww/W0 jVTwJKkDYlr2oLa2cZKS1LJgc1LVvHSfm9tmIax0We/ackgfoamiEdQEFIsLWAR67pw3 GAk9yos95MKYy8A02YUddNv1lM3lZQsz/+WFaViaRThePb2iuTgzlUKGIMtmkeU0B7cm 09mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762998442; x=1763603242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LCfGLyHTlwnlWI3FvQiRrpmgPRI/lUHNtrwWz9sKS0g=; b=qr+j8gpvCtNhZebq1o1nfLX+E5S3rR9S6QqrcH5PwwqTDMWW+oR2TYUxLrrEJCpdxV bNtRr5YXnnsh8GNIVgpEvavugXN3ZyqAT2NsxS9/dg/mDKaAEnyBTUcQDLoZ2xbQcC0F lF8+q00q+/TW4qaKGHNivMA6b7COLTpbN3otfBTfTzToBT8Tpys80pXF8A355Gh/gzHH gbrfzcY6egK2qW4uCHSZlmZoSOdC44eps5SFmV8lv01XTg3ejbQ63ytS1rLxF+JrCicP zK8mqzhXKXCYfimC+xCJKDMJxsZREqVE5C0JCVjCAePenIt1p+prvRJYQTK+0N0gdtcY P7og== X-Forwarded-Encrypted: i=1; AJvYcCUXghXswqkQfA/6n0BES/FXvZMWb3CWj8UQnhL/hylEJh7jjM5/zuEPQ6TcvrxvIysY2sEt56uvbNp2JIA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxr4sEGL9fUgX6K313QCtmsnjxu42OGbmxqf3y2rlIVG1+4y24L 08cZp0lki8fj+ps3uwO4ul5MqADaUMflwnW4NXlvTCVNbznKj8ceTlLvuHLx88dNcLQ= X-Gm-Gg: ASbGncuOcZlTWhrozWnOVbM/Q68OXNlh7QKIq3XIJrGhyHPq5+/bZyeMaNqgZHlPzqC uMlZkhKwGU1bR/PvY1qmqBTX4ebsjW/LkY29vDZO4bV54Bx9WEynQeoHY80WcrDRD+dO+kFCVtU 4OxLBqsZbuIbtBcUCDjHAp9r8qg4Az3aTAV3Z+QsL+oo69678bja1HRcIqbgFf6sF7lAKlLN/47 wA9ytGmw3ul3LcoBw1LP4HnonEH4PKL0YUgouWT4GpoumeoM+nyNXx2V4GQEdtCR66KkPDhUTJa n0U6i56imqynnSJgrHs+jYXPFXJYe/ZWusNGF7IgC9FEhQccM1id8Fpxj/NrDfemM0cbGTEVbzz 9FBsWFkkiQe7XR1ID5do2XH0HUGxKpO7UzTBkgGfbC0iovXcaHRm15F95XFvokVYO9sbpdo7SUO WcgwESCsuZUvFoosHOWCbV0A== X-Google-Smtp-Source: AGHT+IFq0UAOun8d9XJx744M7CwKUVs4/xq+EwynwZ5LpaPcXyVk6iynKKn4ZFAafmUlsME9mB3yew== X-Received: by 2002:a17:902:ef45:b0:295:738f:73fe with SMTP id d9443c01a7336-2984edec698mr65123165ad.30.1762998441862; Wed, 12 Nov 2025 17:47:21 -0800 (PST) Received: from sw06.internal.sifive.com ([4.53.31.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2ccae8sm4986485ad.98.2025.11.12.17.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 17:47:21 -0800 (PST) From: Samuel Holland To: Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Andrew Morton , David Hildenbrand , linux-mm@kvack.org Cc: devicetree@vger.kernel.org, Suren Baghdasaryan , linux-kernel@vger.kernel.org, Mike Rapoport , Michal Hocko , Conor Dooley , Lorenzo Stoakes , Krzysztof Kozlowski , Alexandre Ghiti , Emil Renner Berthing , Rob Herring , Vlastimil Babka , "Liam R . Howlett" , Samuel Holland Subject: [PATCH v3 15/22] riscv: mm: Expose all page table bits to assembly code Date: Wed, 12 Nov 2025 17:45:28 -0800 Message-ID: <20251113014656.2605447-16-samuel.holland@sifive.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20251113014656.2605447-1-samuel.holland@sifive.com> References: <20251113014656.2605447-1-samuel.holland@sifive.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" pgtable-32.h and pgtable-64.h are not usable by assembly code files, so move all page table field definitions to pgtable-bits.h. This allows handling more complex PTE transformations in out-of-line assembly code. Signed-off-by: Samuel Holland --- (no changes since v1) arch/riscv/include/asm/pgtable-32.h | 11 ------- arch/riscv/include/asm/pgtable-64.h | 30 ------------------- arch/riscv/include/asm/pgtable-bits.h | 42 +++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 43 deletions(-) diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/p= gtable-32.h index 90ef35a7c1a5..eb556ab95732 100644 --- a/arch/riscv/include/asm/pgtable-32.h +++ b/arch/riscv/include/asm/pgtable-32.h @@ -17,17 +17,6 @@ =20 #define MAX_POSSIBLE_PHYSMEM_BITS 34 =20 -/* - * rv32 PTE format: - * | XLEN-1 10 | 9 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 - * PFN reserved for SW D A G U X W R V - */ -#define _PAGE_PFN_MASK GENMASK(31, 10) - -#define _PAGE_NOCACHE 0 -#define _PAGE_IO 0 -#define _PAGE_MTMASK 0 - #define ALT_FIXUP_MT(_val) #define ALT_UNFIX_MT(_val) =20 diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/p= gtable-64.h index aad34c754325..fa2c1dcb6f72 100644 --- a/arch/riscv/include/asm/pgtable-64.h +++ b/arch/riscv/include/asm/pgtable-64.h @@ -70,20 +70,6 @@ typedef struct { =20 #define MAX_POSSIBLE_PHYSMEM_BITS 56 =20 -/* - * rv64 PTE format: - * | 63 | 62 61 | 60 54 | 53 10 | 9 8 | 7 | 6 | 5 | 4 | 3 | 2= | 1 | 0 - * N MT RSV PFN reserved for SW D A G U X W= R V - */ -#define _PAGE_PFN_MASK GENMASK(53, 10) - -/* - * [63] Svnapot definitions: - * 0 Svnapot disabled - * 1 Svnapot enabled - */ -#define _PAGE_NAPOT_SHIFT 63 -#define _PAGE_NAPOT BIT(_PAGE_NAPOT_SHIFT) /* * Only 64KB (order 4) napot ptes supported. */ @@ -113,18 +99,6 @@ enum napot_cont_order { =20 #if defined(CONFIG_RISCV_ISA_SVPBMT) || defined(CONFIG_ERRATA_THEAD_MAE) =20 -/* - * [62:61] Svpbmt Memory Type definitions: - * - * 00 - PMA Normal Cacheable, No change to implied PMA memory type - * 01 - NC Non-cacheable, idempotent, weakly-ordered Main Memory - * 10 - IO Non-cacheable, non-idempotent, strongly-ordered I/O memory - * 11 - Rsvd Reserved for future standard use - */ -#define _PAGE_NOCACHE (1UL << 61) -#define _PAGE_IO (2UL << 61) -#define _PAGE_MTMASK (3UL << 61) - /* * ALT_FIXUP_MT * @@ -176,10 +150,6 @@ enum napot_cont_order { =20 #else =20 -#define _PAGE_NOCACHE 0 -#define _PAGE_IO 0 -#define _PAGE_MTMASK 0 - #define ALT_FIXUP_MT(_val) =20 #endif /* CONFIG_RISCV_ISA_SVPBMT || CONFIG_ERRATA_THEAD_MAE */ diff --git a/arch/riscv/include/asm/pgtable-bits.h b/arch/riscv/include/asm= /pgtable-bits.h index 179bd4afece4..18c50cbd78bf 100644 --- a/arch/riscv/include/asm/pgtable-bits.h +++ b/arch/riscv/include/asm/pgtable-bits.h @@ -6,6 +6,16 @@ #ifndef _ASM_RISCV_PGTABLE_BITS_H #define _ASM_RISCV_PGTABLE_BITS_H =20 +/* + * rv32 PTE format: + * | XLEN-1 10 | 9 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 + * PFN reserved for SW D A G U X W R V + * + * rv64 PTE format: + * | 63 | 62 61 | 60 54 | 53 10 | 9 8 | 7 | 6 | 5 | 4 | 3 | 2 = | 1 | 0 + * N MT RSV PFN reserved for SW D A G U X W = R V + */ + #define _PAGE_ACCESSED_OFFSET 6 =20 #define _PAGE_PRESENT (1 << 0) @@ -21,6 +31,36 @@ #define _PAGE_SPECIAL (1 << 8) /* RSW: 0x1 */ #define _PAGE_TABLE _PAGE_PRESENT =20 +#define _PAGE_PFN_SHIFT 10 +#ifdef CONFIG_64BIT +#define _PAGE_PFN_MASK GENMASK(53, 10) +#else +#define _PAGE_PFN_MASK GENMASK(31, 10) +#endif /* CONFIG_64BIT */ + +#if defined(CONFIG_RISCV_ISA_SVPBMT) || defined(CONFIG_ERRATA_THEAD_MAE) +/* + * [62:61] Svpbmt Memory Type definitions: + * + * 00 - PMA Normal Cacheable, No change to implied PMA memory type + * 01 - NC Non-cacheable, idempotent, weakly-ordered Main Memory + * 10 - IO Non-cacheable, non-idempotent, strongly-ordered I/O memory + * 11 - Rsvd Reserved for future standard use + */ +#define _PAGE_NOCACHE (UL(1) << 61) +#define _PAGE_IO (UL(2) << 61) +#define _PAGE_MTMASK (UL(3) << 61) +#else +#define _PAGE_NOCACHE 0 +#define _PAGE_IO 0 +#define _PAGE_MTMASK 0 +#endif /* CONFIG_RISCV_ISA_SVPBMT || CONFIG_ERRATA_THEAD_MAE */ + +#ifdef CONFIG_RISCV_ISA_SVNAPOT +#define _PAGE_NAPOT_SHIFT 63 +#define _PAGE_NAPOT BIT(_PAGE_NAPOT_SHIFT) +#endif /* CONFIG_RISCV_ISA_SVNAPOT */ + /* * _PAGE_PROT_NONE is set on not-present pages (and ignored by the hardwar= e) to * distinguish them from swapped out pages @@ -30,8 +70,6 @@ /* Used for swap PTEs only. */ #define _PAGE_SWP_EXCLUSIVE _PAGE_ACCESSED =20 -#define _PAGE_PFN_SHIFT 10 - /* * when all of R/W/X are zero, the PTE is a pointer to the next level * of the page table; otherwise, it is a leaf PTE. --=20 2.47.2