From nobody Tue Apr 7 07:08:24 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65F30C4332F for ; Mon, 14 Nov 2022 09:07:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236757AbiKNJHx (ORCPT ); Mon, 14 Nov 2022 04:07:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236791AbiKNJHY (ORCPT ); Mon, 14 Nov 2022 04:07:24 -0500 Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB7941D0E0 for ; Mon, 14 Nov 2022 01:06:07 -0800 (PST) Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-13bd19c3b68so11822386fac.7 for ; Mon, 14 Nov 2022 01:06:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=XuilwbSjTkXNw6j4kYlnUJ0pwJrZlWFK5/+cTZqJbNQ=; b=dQRXwhn6GU2oVP9rmiDV3LUCEuVG7c7xXVfDgz5AhmWkHM8hafgbZ/QHBKe+g4lGKW QR5nRzGhcT8FM66NbfL8s176tW+pVjyTNeKuEKWYJnDSt0jZ51P0A+v8UPHkMAAXw29f jJM2IB/NM2lasvFAhF0rYCg4NIIbvCUh+vJnYoiaoorf1I2Q9m6ZHXcQSVuGCw6Zzc4q zVvCH4Gpl0o/QBnZnvrl3VrC3NcG9cg8LNxiH505rLVesy3Zj3oGEiVtT6JhlHOQGQ2f 7N9/bjufSTQquYrJJf8+R5BvxCpVJIGRpWTzkxYZF6zYe7UkkMrjbCJBs+yty/MqIynj OEXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XuilwbSjTkXNw6j4kYlnUJ0pwJrZlWFK5/+cTZqJbNQ=; b=MFEHdQTODE863t1JilbZVih7OvxtRRZDZA0ro/6ntn9X9MSUi4ab2gqzMtRT0kOmmt C5mcDvyrlTajyL4LYFEfA6uMX4rmJaC+wxOYNZrXeIWwLUATNxEEXFm26Vp+xJyBoEPD Kq9XQcPcwFuIXn8iIdEE7I9WLKEItQfFc0dST98+6svDYpUV5KtxB00QzDrkKyYfBZUF VejKu1r0lWUUjBCSvcmPwF2ZiSYgspE1tBVL9GBFnk8Rwd+l+ivg2FvCGZnazfwwk+zQ MDhDXZOTdczlfvP1S4N+c2c2iQwvTdY8kx+xFelCe+pqFItKcgwIilalJLTJcn9f3Cp3 /pfQ== X-Gm-Message-State: ANoB5pmyMC6APyy5OMzdpSkimN0PdfOBTRm4E33VTCzQ/89fK999Bc+D zbpfkEulJN7mVvVysUg6wErx9Q== X-Google-Smtp-Source: AA0mqf7B5kjNytx8G6jhKFnk9HRp3NbSU55I/62IjswwphuZUNYZsUlMNIY/ARMiNb+zq4pMcv229w== X-Received: by 2002:a05:6871:4192:b0:13b:6d76:8bcb with SMTP id lc18-20020a056871419200b0013b6d768bcbmr6016240oab.281.1668416767176; Mon, 14 Nov 2022 01:06:07 -0800 (PST) Received: from anup-ubuntu64-vm.. ([103.97.165.210]) by smtp.gmail.com with ESMTPSA id n2-20020aca2402000000b00354948e04e4sm3432939oic.2.2022.11.14.01.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 01:06:06 -0800 (PST) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Arnd Bergmann , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Mayuresh Chitale Subject: [PATCH v6 1/3] RISC-V: Fix MEMREMAP_WB for systems with Svpbmt Date: Mon, 14 Nov 2022 14:35:34 +0530 Message-Id: <20221114090536.1662624-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090536.1662624-1-apatel@ventanamicro.com> References: <20221114090536.1662624-1-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, the memremap() called with MEMREMAP_WB maps memory using the generic ioremap() function which breaks on system with Svpbmt because memory mapped using _PAGE_IOREMAP page attributes is treated as strongly-ordered non-cacheable IO memory. To address this, we implement RISC-V specific arch_memremap_wb() which maps memory using _PAGE_KERNEL page attributes resulting in write-back cacheable mapping on systems with Svpbmt. Fixes: ff689fd21cb1 ("riscv: add RISC-V Svpbmt extension support") Co-developed-by: Mayuresh Chitale Signed-off-by: Mayuresh Chitale Signed-off-by: Anup Patel Acked-by: Conor Dooley --- arch/riscv/include/asm/io.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 92080a227937..42497d487a17 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -135,4 +135,9 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) =20 #include =20 +#ifdef CONFIG_MMU +#define arch_memremap_wb(addr, size) \ + ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) +#endif + #endif /* _ASM_RISCV_IO_H */ --=20 2.34.1 From nobody Tue Apr 7 07:08:24 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA6EFC433FE for ; Mon, 14 Nov 2022 09:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235960AbiKNJH6 (ORCPT ); Mon, 14 Nov 2022 04:07:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236848AbiKNJH1 (ORCPT ); Mon, 14 Nov 2022 04:07:27 -0500 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FF111EC55 for ; Mon, 14 Nov 2022 01:06:12 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id n186so10769561oih.7 for ; Mon, 14 Nov 2022 01:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=qoWw75G040ie7NtRU1t+qmFKMYccQlQoZxH65ktuUwc=; b=iw9Zn5wy3+2CheYk+HVFSGRBQPMEZOzZdXThvNA5wyIVOJtvxvOTQ2Di46U4JtsTht 05BGqmPk7xhqxM5lMFWPJFdT5j3kWYNpuQa1womt+KcVO4WC9osXK7+IkZl5OH7VAOxd 4bDH4oJvu4vVDT5aTyrn+FeQ79E+/PLS50EkGAWgqiXo2Oh70O24CxX4ljF3Vf+E/GNp Gq5pA4bbJ4wMqrr8dUGIDyGV6oZK32en879tDPV3UPAfuDdsrL9lNS5ehqBSakIVmYe1 gcHvYbnQZSdtrqOt3z3BXSic/bL5gCQ67z8CqVvnFbMJb9PjRASxShXBN7Fkwn75e9T3 Ux4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qoWw75G040ie7NtRU1t+qmFKMYccQlQoZxH65ktuUwc=; b=yX+G73Ehtuh5EutpEWLlLRMSUEOYhlHgD3wG1vLZQZidRCX1lI0AkCy1LdxdlpXkh3 yApp/nKPuJ+mYE0ori4sMh8aTMLMsv3taU8Gmdhpmucozv/nMqeb0iRDKFG3Nkm3gKEn MQ6318k8gDZs/T3FMH1glZ+OYmfwwwJrdBT2tatGymBBz2yJrJbddn4P8t9tHNhCMAsk 5FfVg5knImH7DdWU+/f023x0+v6q3xUWmn5mVJa1K3+9CXVwGFZQ2nV2ZTOxmRF20PK1 ShpPbCkQLZVTYJEzYM5RqUmH0gShraQj+f3Jby0NPwMp2rJuqaDdrAGyHBvRnTSl6sRE srqA== X-Gm-Message-State: ANoB5pm3AqQAIc9EYoQ9L8F8Gi1W9xVZKrLAGadwxJZe/Dy3ifMJo/ch Vj3KSxodKaNtkIqSwDd/qY2s5A== X-Google-Smtp-Source: AA0mqf7m8kcUu9r7qqVEnPOsTVHBFEw7ibiEt7s/gaYqgSEg0zIa+JeX1KtG63NZnHWjukxkKfep0Q== X-Received: by 2002:aca:110a:0:b0:35a:c54:3ad2 with SMTP id 10-20020aca110a000000b0035a0c543ad2mr5146218oir.89.1668416771563; Mon, 14 Nov 2022 01:06:11 -0800 (PST) Received: from anup-ubuntu64-vm.. ([103.97.165.210]) by smtp.gmail.com with ESMTPSA id n2-20020aca2402000000b00354948e04e4sm3432939oic.2.2022.11.14.01.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 01:06:11 -0800 (PST) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Arnd Bergmann , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Mayuresh Chitale Subject: [PATCH v6 2/3] RISC-V: Implement arch specific PMEM APIs Date: Mon, 14 Nov 2022 14:35:35 +0530 Message-Id: <20221114090536.1662624-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090536.1662624-1-apatel@ventanamicro.com> References: <20221114090536.1662624-1-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The NVDIMM PMEM driver expects arch specific APIs for cache maintenance and if arch does not provide these APIs then NVDIMM PMEM driver will always use MEMREMAP_WT to map persistent memory which in-turn maps as UC memory type defined by the RISC-V Svpbmt specification. Now that the Svpbmt and Zicbom support is available in RISC-V kernel, we implement PMEM APIs using ALT_CMO_OP() macros so that the NVDIMM PMEM driver can use MEMREMAP_WB to map persistent memory. Co-developed-by: Mayuresh Chitale Signed-off-by: Mayuresh Chitale Signed-off-by: Anup Patel Acked-by: Conor Dooley --- arch/riscv/Kconfig | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/pmem.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 arch/riscv/mm/pmem.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index fa78595a6089..c0e22648bd16 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -25,6 +25,7 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MMIOWB + select ARCH_HAS_PMEM_API select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMU diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index d76aabf4b94d..b4f35da889bf 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -13,6 +13,7 @@ obj-y +=3D extable.o obj-$(CONFIG_MMU) +=3D fault.o pageattr.o obj-y +=3D cacheflush.o obj-y +=3D context.o +obj-y +=3D pmem.o =20 ifeq ($(CONFIG_MMU),y) obj-$(CONFIG_SMP) +=3D tlbflush.o diff --git a/arch/riscv/mm/pmem.c b/arch/riscv/mm/pmem.c new file mode 100644 index 000000000000..089df92ae876 --- /dev/null +++ b/arch/riscv/mm/pmem.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022 Ventana Micro Systems Inc. + */ + +#include +#include + +#include + +void arch_wb_cache_pmem(void *addr, size_t size) +{ + ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL(arch_wb_cache_pmem); + +void arch_invalidate_pmem(void *addr, size_t size) +{ + ALT_CMO_OP(inval, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL(arch_invalidate_pmem); --=20 2.34.1 From nobody Tue Apr 7 07:08:24 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE015C4332F for ; Mon, 14 Nov 2022 09:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235695AbiKNJIC (ORCPT ); Mon, 14 Nov 2022 04:08:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236885AbiKNJHb (ORCPT ); Mon, 14 Nov 2022 04:07:31 -0500 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E1801EC77 for ; Mon, 14 Nov 2022 01:06:16 -0800 (PST) Received: by mail-oi1-x234.google.com with SMTP id q186so10756130oia.9 for ; Mon, 14 Nov 2022 01:06:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=5TnLW0RVC/l/l6ZpSJGiQ9RS55Sh7Bww2u/zF6eZ2bY=; b=NcRntpJUBXD8X/NLF4ZQYon44J4DDA4fW4p44wwVOyzCLSddzAsRYxd3Hs04Jq4WQp taS2Xb/+DHAySaLWYUuHLHTMZEohNNtNBl6ZgSsaZuFtPW6xCnTO25d6jYdddhnfFJMi eLLnCj2xC5gI9RAISo+4T9uM+IJ7pMADNDkCKQe8vb6nMu+Ts+WP3ic1NyYKdGeTTccI 6zENqCEG8GuhoWacXYSrr4kZ93M395NaZmPUfDc6i843EH8DHNv6XTXdj90EVLQZFAm6 SQpeVr/VyZIGm6y7U2T3aib7FEg6h66EAt1gEg0xmiGgwg+vC45hKiPPxISmll6HcuY2 LQcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5TnLW0RVC/l/l6ZpSJGiQ9RS55Sh7Bww2u/zF6eZ2bY=; b=oLfEYwDb2vXywOyvLHhUnxrELatC3XaYJwdqtdREnPPr3bAuIWJGoimQixyhVTll2H ebVWoFVorDGd3Kjo4NlRPv0EYAbs2bw5O07OZbtdUb6ccnrcwHyN04rCEMNQur5N4dJy ab0UCrUqSn5drdMPxDm4fEB/vomDTFp63GON8GrmC/OY3xAWuUooeATUlz2eJN/vjEvH DZsbKncXKPPkLWviVKnVJZ3bYGu7FwaxUjWllKIWW4QMQuM/UOokS051XBvsdib3zGuP km+MhmQH9uQohKLpsoaHkms5Wf3L3LGq2P2ZU0dn/Q6i87UjWmYbplkHVmQG7+EcaFMt OQ0A== X-Gm-Message-State: ANoB5pnmaanWb8RPPrT3WB/nNhr+3mz8+55qSpObfTL2kIL0M+j0yDNg 9qZXPXYgy6d5mdh4wq84onFZHw== X-Google-Smtp-Source: AA0mqf73xXWXRmFpczTe5uuG5ukc7zfCe8gT0PITVl8J6K3RsuhawTE/L38MdQ+HsZ+RzsqFx4U1Bg== X-Received: by 2002:a05:6808:130c:b0:34d:d3a5:b2d with SMTP id y12-20020a056808130c00b0034dd3a50b2dmr5235455oiv.224.1668416775584; Mon, 14 Nov 2022 01:06:15 -0800 (PST) Received: from anup-ubuntu64-vm.. ([103.97.165.210]) by smtp.gmail.com with ESMTPSA id n2-20020aca2402000000b00354948e04e4sm3432939oic.2.2022.11.14.01.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 01:06:15 -0800 (PST) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Arnd Bergmann , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH v6 3/3] RISC-V: Enable PMEM drivers Date: Mon, 14 Nov 2022 14:35:36 +0530 Message-Id: <20221114090536.1662624-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221114090536.1662624-1-apatel@ventanamicro.com> References: <20221114090536.1662624-1-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We now have PMEM arch support available in RISC-V kernel so let us enable relevant drivers in defconfig. Signed-off-by: Anup Patel Acked-by: Conor Dooley --- arch/riscv/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 05fd5fcf24f9..462da9f7410d 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -159,6 +159,7 @@ CONFIG_VIRTIO_MMIO=3Dy CONFIG_RPMSG_CHAR=3Dy CONFIG_RPMSG_CTRL=3Dy CONFIG_RPMSG_VIRTIO=3Dy +CONFIG_LIBNVDIMM=3Dy CONFIG_EXT4_FS=3Dy CONFIG_EXT4_FS_POSIX_ACL=3Dy CONFIG_EXT4_FS_SECURITY=3Dy --=20 2.34.1