From patchwork Mon Nov 14 09:05:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 19621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2048111wru; Mon, 14 Nov 2022 01:19:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DnPC4oF5zzYZHvluEwr1Y4xyUEte9C8kV7BSDOKtX9slPekTAAd4SRaDu8a8E4qAkY0jS X-Received: by 2002:a17:902:a38d:b0:186:f256:91d1 with SMTP id x13-20020a170902a38d00b00186f25691d1mr12962996pla.151.1668417591735; Mon, 14 Nov 2022 01:19:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668417591; cv=none; d=google.com; s=arc-20160816; b=oNEz+560Ef6go3NUx+xEb5KLrj8qWJM8pc0Uy9K8aTgzUpirVuNXAAGWR3+/yr8Tjl 3sH4LYwOCRyXnojaHgrR1WZITuHCfPZhldN1YbupWMdvKHB4R87J7YdkyrCmyN7xCTKo fC0sfzNRvbTo7mtuQEFx8k47mC/sfznCUdaH4c4d8+wqYxNkb39cYN3iIQVRO1GKbCSQ UP0ehT2gjgjifnIfpN05CjA4uKnZQnsxpR0gEczORNZlofXdpk0z7utG7W9IZmrRS6fU uUWvWF7Iw4CwoJJHaCKJJirKNUuMkBdlwlOTYQjTFdiKaU9lDKrZQiMDSLUa3358ebom 6rqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qoWw75G040ie7NtRU1t+qmFKMYccQlQoZxH65ktuUwc=; b=iz3trn5iMAJWjeqMCKcgMFfQCp2/mXWW+BRQVLNvNgNFjDHw3a4PzNwwquinIdg/l7 kX23rkISQNQYWYy4Nz1YdVxLyYtnK51MyhmZkiEJYinjn7zkwkiVQgV4QivJUEAqBgvD TsPJKEsTS/r1iHzubcKvrtazKIWl3FK5D1Q+3d8fv1W9TRTQnA7zLlcEwm/QM5PVUTSD C7ya3cdeLl05JKr7jniBP2JxnYzwBWag1/naUWQDx58NIS2MBF6QLoln6aGfktovbT+X +c4AI1MrweDTH64dxv3DftWO2kdtF3BQ9L2toqGxkmTvtOm8a8GrUHwc1lUSibHjJ4G2 Fqzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=iw9Zn5wy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c3-20020a056a000ac300b00565cb1ebdbcsi9925479pfl.277.2022.11.14.01.19.36; Mon, 14 Nov 2022 01:19:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=iw9Zn5wy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236936AbiKNJH5 (ORCPT + 99 others); Mon, 14 Nov 2022 04:07:57 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749462644614557181?= X-GMAIL-MSGID: =?utf-8?q?1749462644614557181?= 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 --- 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 += extable.o obj-$(CONFIG_MMU) += fault.o pageattr.o obj-y += cacheflush.o obj-y += context.o +obj-y += pmem.o ifeq ($(CONFIG_MMU),y) obj-$(CONFIG_SMP) += 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);