From patchwork Wed Oct 19 13:11:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 5464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp331625wrs; Wed, 19 Oct 2022 06:37:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6TurtumSm4Y1yZoGxyiQcRubf5zwUbWIgp8lfr40edDQqWYVuMC+qEqGcfkjdrMvQvnr+M X-Received: by 2002:a17:903:1c6:b0:185:47ce:f4f0 with SMTP id e6-20020a17090301c600b0018547cef4f0mr8612758plh.132.1666186621820; Wed, 19 Oct 2022 06:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186621; cv=none; d=google.com; s=arc-20160816; b=bli+NCC6v+OB2y4uoJX4XbN5A0XlYNkVJOHA6gNag8ZgTa0SrrcXJDZtlrCDGHhDdz w69dJfzgyvWu+QjdOc4VfPstMivlfEF/cwf1D1u4zzYhQjIW2lklOAhAFrjCu1FdMUxf WMGEWtdhNB4du3lgskUMc/ITvvnlDofsv/3g9hF/5KTd/aFUL3Y5PQc5tE9/+Qw0kaOF nqQnohyUHJdrD96MIMVSiJCAAgfmOcH9dVQK2j1i+WbHbTpDlmvwe4LlFWv5Eq4g/KOB mUMPrEEXuanhqD2Nndmvh5HG3YuyqjjWqk/D0xrmLO4g/Wd12sc5UcwYlbfUlJe1W2IE /5zA== 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=rh1RnpsntJfELASsE5PqiwcPYKRcDpF732XU4z7NxZA=; b=D9swIFk/AtzsfT022cvKkSz4YkQnP1kLC9rRONjACMJZ/OY2JDNanfKi8WdePoqfbE CK/+6o3CTIcBpwxxJ3Lv+I+VFvgzwhVF6LSJoATn7oUk6U2/BXuIVQrkr0ZyX/EjCli1 XLuYJ4twX+kpsPdxe7ER/xCey+mLJzvrS91ljR25uvQp9aFgg/ZoVVmKaxnvdn1yIobz 2CYWsqdJmapTJ7Pl1Mxbw/4OxQBJGoURLiocokfiEjNPAL3k04VR6bwkXyeLXeaHJk7K Oe0N27YyPNlBalms7dc9X0Jg6F8AHGRvacMQxeW3Floee8+PmNpH7uko554Tvzg1A/UE 9UwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Wcyhp1LT; 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 bb5-20020a170902bc8500b00181bcfcaa6csi17175001plb.45.2022.10.19.06.36.48; Wed, 19 Oct 2022 06:37:01 -0700 (PDT) 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=Wcyhp1LT; 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 S230171AbiJSN0j (ORCPT + 99 others); Wed, 19 Oct 2022 09:26:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbiJSN0S (ORCPT ); Wed, 19 Oct 2022 09:26:18 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F7381DC4E1 for ; Wed, 19 Oct 2022 06:12:47 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id i6so17172224pli.12 for ; Wed, 19 Oct 2022 06:12:46 -0700 (PDT) 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=rh1RnpsntJfELASsE5PqiwcPYKRcDpF732XU4z7NxZA=; b=Wcyhp1LTucgrnH6f1PPH+sYeTNlqJGZ0rALt4DLvQwuGHO8D3wJ5CNzyJRYu7X9Ke/ MbTeah1+aXgUqp8DjaId+4YLIm1qTyJJwoP0gsjFnrHELrXE4VP18rsyQ42+siIw+Nic k+zMguu48+H+c6VfVVcl31JGio6i8qBgk67cNpJzvi3HPQKTTzr/zV0Ivi3drxqtYeyo xj5YK9j7ijzFamxSrgSlT11MEm+8b57VTmuhP03hBoOtKCc6/K1Mi4nHb1UnXqfVsytQ J0dCBVWqSEpKr/dh1D/5iLLtv9KzGZbaHUkcwPdiYZpsLO5kc/pl9I1r4/RekkVHkpDd L7TA== 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=rh1RnpsntJfELASsE5PqiwcPYKRcDpF732XU4z7NxZA=; b=hY4y/bw9vy8b3TnbXFWEM0V67Kh0ao8MiXDA1iHwFk7HqK2/Qn7lttHWW8JavAnXWj xH5PZ1b87F8IiUzegGk1MqTNU7dr9+68QwmMurtxtNEOq7EoIXiDFHwnz404rc5eyWgM os4STr2TboAK4Zw81Py7eZOiQgKV1aZEEtZrcCzjxebCFOUPF18WTEgMHH4hXW8em5vA HLXF74+Erb0nT+i/NSZcGTH/Vf+xh/hvAQKV+6672c3FlpOuhxF/+9EKi3c1ACKN1Mzi zIy5KRH5WY9TWIicXtxksylsIr5fI1M5b9n1EEkQL5h0Ixjn83opkDZg2cPEM3Ujra5Y YThA== X-Gm-Message-State: ACrzQf3hvXvYgMdEDJfwXTuGXjuI+ZJgSOOd5PPq3KO7bJcGbj91Rsla Ujhp4pYL2tCfMhGA2SdH7F6AGg== X-Received: by 2002:a17:90b:128d:b0:20a:da54:788 with SMTP id fw13-20020a17090b128d00b0020ada540788mr9966123pjb.65.1666185101695; Wed, 19 Oct 2022 06:11:41 -0700 (PDT) Received: from anup-ubuntu64-vm.. ([171.76.82.102]) by smtp.gmail.com with ESMTPSA id n12-20020a170902d2cc00b00172897952a0sm10934478plc.283.2022.10.19.06.11.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 06:11:41 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jones , kernel test robot , Anup Patel , Conor Dooley Subject: [PATCH v4 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM Date: Wed, 19 Oct 2022 18:41:25 +0530 Message-Id: <20221019131128.237026-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019131128.237026-1-apatel@ventanamicro.com> References: <20221019131128.237026-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?1747123302971130020?= X-GMAIL-MSGID: =?utf-8?q?1747123302971130020?= From: Andrew Jones riscv_cbom_block_size and riscv_init_cbom_blocksize() should always be available and riscv_init_cbom_blocksize() should always be invoked, even when compiling without RISCV_ISA_ZICBOM enabled. This is because disabling RISCV_ISA_ZICBOM means "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use with RISCV_ISA_ZICBOM or not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling without RISCV_ISA_ZICBOM. Fixes: 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing") Reported-by: kernel test robot Signed-off-by: Andrew Jones Signed-off-by: Anup Patel Reviewed-by: Conor Dooley Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- arch/riscv/include/asm/cacheflush.h | 8 ------ arch/riscv/mm/cacheflush.c | 38 ++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 ----------------------------- 3 files changed, 38 insertions(+), 49 deletions(-) diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h index 8a5c246b0a21..f6fbe7042f1c 100644 --- a/arch/riscv/include/asm/cacheflush.h +++ b/arch/riscv/include/asm/cacheflush.h @@ -42,16 +42,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local); #endif /* CONFIG_SMP */ -/* - * The T-Head CMO errata internally probe the CBOM block size, but otherwise - * don't depend on Zicbom. - */ extern unsigned int riscv_cbom_block_size; -#ifdef CONFIG_RISCV_ISA_ZICBOM void riscv_init_cbom_blocksize(void); -#else -static inline void riscv_init_cbom_blocksize(void) { } -#endif #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported(void); diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 6cb7d96ad9c7..57b40a350420 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 SiFive */ +#include #include #ifdef CONFIG_SMP @@ -86,3 +87,40 @@ void flush_icache_pte(pte_t pte) flush_icache_all(); } #endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL(riscv_cbom_block_size); + +void riscv_init_cbom_blocksize(void) +{ + struct device_node *node; + unsigned long cbom_hartid; + u32 val, probed_block_size; + int ret; + + probed_block_size = 0; + for_each_of_cpu_node(node) { + unsigned long hartid; + + ret = riscv_of_processor_hartid(node, &hartid); + if (ret) + continue; + + /* set block-size for cbom extension if available */ + ret = of_property_read_u32(node, "riscv,cbom-block-size", &val); + if (ret) + continue; + + if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + } else { + if (probed_block_size != val) + pr_warn("cbom-block-size mismatched between harts %lu and %lu\n", + cbom_hartid, hartid); + } + } + + if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c index b0add983530a..d919efab6eba 100644 --- a/arch/riscv/mm/dma-noncoherent.c +++ b/arch/riscv/mm/dma-noncoherent.c @@ -8,13 +8,8 @@ #include #include #include -#include -#include #include -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL(riscv_cbom_block_size); - static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, @@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize(void) -{ - struct device_node *node; - unsigned long cbom_hartid; - u32 val, probed_block_size; - int ret; - - probed_block_size = 0; - for_each_of_cpu_node(node) { - unsigned long hartid; - - ret = riscv_of_processor_hartid(node, &hartid); - if (ret) - continue; - - /* set block-size for cbom extension if available */ - ret = of_property_read_u32(node, "riscv,cbom-block-size", &val); - if (ret) - continue; - - if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - } else { - if (probed_block_size != val) - pr_warn("cbom-block-size mismatched between harts %lu and %lu\n", - cbom_hartid, hartid); - } - } - - if (probed_block_size) - riscv_cbom_block_size = probed_block_size; -} -#endif - void riscv_noncoherent_supported(void) { WARN(!riscv_cbom_block_size, From patchwork Wed Oct 19 13:11:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 5465 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp331647wrs; Wed, 19 Oct 2022 06:37:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4VFHQEqYhmpPqHjrjKvFKFyXWJqXoLD5Q1dBYMJltV611bz4FJEQZUTy8iWql2zVVI6U1x X-Received: by 2002:a65:6d89:0:b0:421:94bc:cb89 with SMTP id bc9-20020a656d89000000b0042194bccb89mr7236741pgb.129.1666186635896; Wed, 19 Oct 2022 06:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186635; cv=none; d=google.com; s=arc-20160816; b=xcfC0vkmMXZlklwiwHSLkMBLSQHtkjdBGpmMdz+l9aBqZtIhXHcR2Du6yleBNNB9yB gjxNm4mByrbjRAOeyfd+GqdzTwPpVheJVNwvNYMLRy215sOw///QoaJS6RAuZtH+rQwS o0tpzUdG2GWziPBYf9QWVQOeTvrWCju+jwCsOdGVx9Td2gHn3X9WOorIxV5M6NLIDxeJ wWCVuUsDSSjF/Dy1tXAPz2qpFki4THOKEiVTr8jz2zAwYF8dNtUlUEDzid/R79hX68U0 sON/UZs/qnWKbtPtY8mdbdn1oZIgmiE99TXNSpjjvfJJ14yeaWU9jOdMdKiAfBGZ3knA Eomw== 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=vAvEVwdPVzOcq2kBtufcX9nitBNib2gQ4gtkOEEFeSI=; b=HXPa1EbdR/kuaJ8hfQPQHVvtZfhq2QQWVHF4OLSpBjIGRi4mXz6t71HPRrZ9N9QAlW wGlnK5+mSFpSAO+C8Q6NkeRnXKrG9tzSH9nT1W0szC5+NwZT1aPG2V5eFL4hOrPGpT6b rVJrm9QYIwl4ZJdWlN3g2DwXWsHIoORkYD5f5eUIOJTBIS8V7NmgLtk+0hRRwtDB7XqF b9/jxNMlTQdpAn1V93ydD6jYzwLtHfwrFP98/ZQahyuwQ+Sgia70tlTgh0bnCvYopI2B 5kfynzX2Fd8ScecxhofHouBbG6KpsKqBJsAo/tZyPr+KKDEDfhW1tLAVJ/TMQmEPA0r4 zjnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=lxyzgM77; 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 9-20020a631849000000b0045f83471400si18574573pgy.328.2022.10.19.06.37.01; Wed, 19 Oct 2022 06:37:15 -0700 (PDT) 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=lxyzgM77; 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 S231519AbiJSN1J (ORCPT + 99 others); Wed, 19 Oct 2022 09:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbiJSN0p (ORCPT ); Wed, 19 Oct 2022 09:26:45 -0400 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 249A01DC80F for ; Wed, 19 Oct 2022 06:13:08 -0700 (PDT) Received: by mail-oi1-x22a.google.com with SMTP id x188so19186821oig.5 for ; Wed, 19 Oct 2022 06:13:07 -0700 (PDT) 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=vAvEVwdPVzOcq2kBtufcX9nitBNib2gQ4gtkOEEFeSI=; b=lxyzgM77oVhyr2xYFxJj6wgQvry6rw4Y/+zIvaG6JfmYtSzQ+X/1aPsePwBNrnegwI UrY3/A1/YLrrc1SIB0jp8+zD7aA98y9QtCArUpqYXnMw5Dl6VWnG3iDZuyf1BgGGohqT 1l9CyxXHnpqjwurbYuT9nD7l0kpliUcju0mwn+yFEAvwgXbH6lu8+EDbPW1ou1EWw4d0 i8arRfQLRw/k0jmr0IQml/LWHNUCdyXuEptr8wqAxovxLLP0t6dVC1zBEVwFmRU6HrPR foFXA9X8UDYRdXrxUc+XpDAQmh4P+zLMHzd7Q4Ct6xrxImFMYovLYXg9s6KdCxtlBdrg 3gMw== 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=vAvEVwdPVzOcq2kBtufcX9nitBNib2gQ4gtkOEEFeSI=; b=vjuYNauTUwzvhyf5vtFOPGDYvN6XWyYkh64tDz9iAL0KTcDB2P9cdFTpbWyLd4rB9a j908noITuEmRd5RCKNaeQKYMeCnGfBX5mNAGAlkxVHvX22mAejIzqZRLkFccLb4xI+mF 2IDrM+nxTfBBhBnlAzhIlJKrKHVrasT3a1HAdFc04h7mt/JVGws0WqeDAbY5TPplE3lO zXcfa0DGtBn0h34hY+CdDqsgQ32mCaP5J6oLttI35WkpnlWABRs1tE3RM9meVbs1qiZQ IUNXXKbSXSZ4CAO2DOympHRKZD/9hFDSNZSRFPPkO41Hj48tKLHHTp+1JkBh/jAQTY2h jnNg== X-Gm-Message-State: ACrzQf2cWQzrpesvBmYog8hgw1D3ayZ2DRs43PvVeuDiJjsvCwlLiDtH QvgmbdThcapYqDcY8cHErFQJF+SXtI871g== X-Received: by 2002:a17:90b:4c52:b0:20d:7917:4cb3 with SMTP id np18-20020a17090b4c5200b0020d79174cb3mr45614039pjb.6.1666185105397; Wed, 19 Oct 2022 06:11:45 -0700 (PDT) Received: from anup-ubuntu64-vm.. ([171.76.82.102]) by smtp.gmail.com with ESMTPSA id n12-20020a170902d2cc00b00172897952a0sm10934478plc.283.2022.10.19.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 06:11:44 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Mayuresh Chitale Subject: [PATCH v4 2/4] RISC-V: Fix ioremap_cache() and ioremap_wc() for systems with Svpbmt Date: Wed, 19 Oct 2022 18:41:26 +0530 Message-Id: <20221019131128.237026-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019131128.237026-1-apatel@ventanamicro.com> References: <20221019131128.237026-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?1747123318271142042?= X-GMAIL-MSGID: =?utf-8?q?1747123318271142042?= Currently, all flavors of ioremap_xyz() function maps to the generic ioremap() which means any ioremap_xyz() call will always map the target memory as IO using _PAGE_IOREMAP page attributes. This breaks ioremap_cache() and ioremap_wc() on systems with Svpbmt because memory remapped using ioremap_cache() and ioremap_wc() will use _PAGE_IOREMAP page attributes. To address above (just like other architectures), we implement RISC-V specific ioremap_cache() and ioremap_wc() which maps memory using page attributes as defined by the Svpbmt specification. Fixes: ff689fd21cb1 ("riscv: add RISC-V Svpbmt extension support") Co-developed-by: Mayuresh Chitale Signed-off-by: Mayuresh Chitale Signed-off-by: Anup Patel Tested-by: Heiko Stuebner --- arch/riscv/include/asm/io.h | 10 ++++++++++ arch/riscv/include/asm/pgtable.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 92080a227937..92a31e543388 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -133,6 +133,16 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) #define outsq(addr, buffer, count) __outsq(PCI_IOBASE + (addr), buffer, count) #endif +#ifdef CONFIG_MMU +#define ioremap_wc(addr, size) \ + ioremap_prot((addr), (size), _PAGE_IOREMAP_WC) +#endif + #include +#ifdef CONFIG_MMU +#define ioremap_cache(addr, size) \ + ioremap_prot((addr), (size), _PAGE_KERNEL) +#endif + #endif /* _ASM_RISCV_IO_H */ diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 7ec936910a96..346b7c1a3eeb 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -182,6 +182,8 @@ extern struct pt_alloc_ops pt_ops __initdata; #define PAGE_TABLE __pgprot(_PAGE_TABLE) #define _PAGE_IOREMAP ((_PAGE_KERNEL & ~_PAGE_MTMASK) | _PAGE_IO) +#define _PAGE_IOREMAP_WC ((_PAGE_KERNEL & ~_PAGE_MTMASK) | \ + _PAGE_NOCACHE) #define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP) extern pgd_t swapper_pg_dir[]; From patchwork Wed Oct 19 13:11:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 5466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp331706wrs; Wed, 19 Oct 2022 06:37:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UnWXx60ZQk7smm3QmD/4eckP4yd+AkztyXbE0ue/cuueck0WKc0Vwtkw8V6mbHq3B/x+q X-Received: by 2002:a17:90b:4a90:b0:20d:5c5e:1622 with SMTP id lp16-20020a17090b4a9000b0020d5c5e1622mr46031114pjb.50.1666186642206; Wed, 19 Oct 2022 06:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186642; cv=none; d=google.com; s=arc-20160816; b=sCdvskyMMi+VjRfLkR06PVbMaxu68Dp+CCtdGrh/tg/JjzkQnI7p0vVYZOyjfQ9DHT sgb73X8f9hQaSHptfsyMri1hqEY98TQudXl2SXpkjC4LIKBDU5T78N3uSAtnOOeJ5GYz J2FGq7rezM+HXSy8xPd2tm3ow9EvJ7b7QhKhkaAUDmHt/gcbn3n+BwwbrOfHkhpHdEQw wnUe8FNCj8czPja5lxFm6ZtRSNJFstv6W4wCClMIVo5MWnzhzywMVtpeC6VxDA9AiI4g bfDMARaCjM2WQsVuzH1h7F2UPauy5HTU6u3VLm8vS9K0q8YeoZxYxzOEFPcFJWwls8j2 9mZQ== 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=VDJV4ZwRVQLzE0DQMb9i2tBKWni84XeHMbgigRoQK/0=; b=0A76koqm3RnvicvhSZJ2/54RfxqXFjH/scUVztU3qApfOSVPsjNYIQ9T1drjvcl7ST s/8XPbWKg5VR/L6ZBIQJZ5eP2zESFs9rsU4j34c6LFqcmfETKZn8zhD9vv0M1EnHWr3+ 1vzkO7AyyalevYwKJNOy8xnncVYpXPmL+SGDvyozCniJS0m9o3RkahtkVL3M5zgyExHF bFwQfEU6sGd5WjXPAjGoVa9jLf61ZEL+fdxzTXFfqufSJI9KRG/F7zlfu3Mva0J4mrB9 IWuBwJ0Y0f8bzXR97wPweyzm8w3eJ0EBnqf8QfS5HeLAE0LT3qRNKjmcMaFkCsKFVEc9 g/0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b="HOkyp3/f"; 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 me8-20020a17090b17c800b001fd6e58cd98si22687678pjb.123.2022.10.19.06.37.08; Wed, 19 Oct 2022 06:37:22 -0700 (PDT) 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="HOkyp3/f"; 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 S229864AbiJSN1q (ORCPT + 99 others); Wed, 19 Oct 2022 09:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbiJSN1P (ORCPT ); Wed, 19 Oct 2022 09:27:15 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EB3D102532 for ; Wed, 19 Oct 2022 06:13:36 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id e129so16200670pgc.9 for ; Wed, 19 Oct 2022 06:13:36 -0700 (PDT) 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=VDJV4ZwRVQLzE0DQMb9i2tBKWni84XeHMbgigRoQK/0=; b=HOkyp3/fLEtCt1yCpma/EVhFQK4FgiHrDx/1YMPDwT9KQrXtZ0+DK7VA6GhN48oRWA 4sG0ELlR4Xx5kFHMLD3IcKQgSiGxSCIYHNPRD6e781OBC4699iRbnlkAlAhprF0gqYki acC7BoHMX02nQX6Pt26dFyxXVI1LBAdKELJ09Ghl43yGZrR73a3ii+p3UpqdhnFHmDS3 0XiS8j+aXMQi6uBmUu0KnVCdN4N4RavsAQEqNU8PGVb2bh7fmWtfDPDtsrXzpGkESvGd aZAwD7ULTmeuMDJfShrg4v3kG6qvCUAGwnSOXlqQ+x8M/tR8DDnBRCjDLrLCFOns0lYR HzVg== 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=VDJV4ZwRVQLzE0DQMb9i2tBKWni84XeHMbgigRoQK/0=; b=qRLZx0IEUeSbZ51NoBUh4zRLh7GJJz5ytf4d2mC2uMo3X7KBC4xfB+NLF2D7Y9m/8R QftfAzEgiSh+YXfc9/rna9kU7I61Pyp1WLOuA7q9ut4MsnfHm+Fg7dg+NddrF7tS1e+O HfaXqz5DJZ4Ytx4O2zSt3nXcSRr4KMvZhgP/hsQmeiZ3JlNPFHNKvEOGnBawfh31r4Gm zzD5HCbLZik1UgBvPpyzHXHUqbMSxJKFM2QairXtoVdOD5U/I8AMp4nSUnq2nC67OYwZ y1Fw3ZZqgeBhxYL8tDHBIT3xcN0IxGC1juyKHipXavjYyVDXyY8liu+NEKVaumhQ1dF/ rpVw== X-Gm-Message-State: ACrzQf06lvoBdO+23aWzF/6KocYSqIyaFdyyzNCr9I1k8p0UmkVzEsSb jH5+uzxGlitGwiwTAIYemTazww== X-Received: by 2002:a65:6b81:0:b0:461:4049:7df7 with SMTP id d1-20020a656b81000000b0046140497df7mr7235376pgw.593.1666185109034; Wed, 19 Oct 2022 06:11:49 -0700 (PDT) Received: from anup-ubuntu64-vm.. ([171.76.82.102]) by smtp.gmail.com with ESMTPSA id n12-20020a170902d2cc00b00172897952a0sm10934478plc.283.2022.10.19.06.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 06:11:48 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Mayuresh Chitale Subject: [PATCH v4 3/4] RISC-V: Implement arch specific PMEM APIs Date: Wed, 19 Oct 2022 18:41:27 +0530 Message-Id: <20221019131128.237026-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019131128.237026-1-apatel@ventanamicro.com> References: <20221019131128.237026-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?1747123324296197657?= X-GMAIL-MSGID: =?utf-8?q?1747123324296197657?= 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 6b48a3ae9843..025e2a1b1c60 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..3b368e547f83 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -31,3 +31,4 @@ endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o +obj-$(CONFIG_ARCH_HAS_PMEM_API) += pmem.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); From patchwork Wed Oct 19 13:11:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 5463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp331548wrs; Wed, 19 Oct 2022 06:37:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NFExLTbyH8+6ub5guCSjo5I10ZP31mu0Uu691z7NpB5vbCL6vR46rPMI6NKw5RB3JjqoD X-Received: by 2002:a17:902:b093:b0:185:4aa1:402c with SMTP id p19-20020a170902b09300b001854aa1402cmr8642546plr.92.1666186623751; Wed, 19 Oct 2022 06:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186623; cv=none; d=google.com; s=arc-20160816; b=btC/Az5TogNhGhcS2sApro7Fxxc5UDyjOit+tAXNyfZgXUVlWE536ggAxZJDUx3sJ4 9NID25DN0qMiMeZuCXgVr8SNqtXoLiWjJl9mI+yFhvFmjkkBF6kuTt6lfm9PPFiq/9aq JAIEwtKqcDdajcomAC6NoiYII6L3v0lY3uhBKMmXZ0UTepHsFLTrWuKgi+saQht4OOVr GM4bWIQ6Su/C/+j38El6CnuqcMCPvGB2QC1AZVDEwQsxA2RzDQ842SqWAxZaXZ6kEbs5 Fdem/b90eHjhPPS/Te+7t75z/o5ia39+pRHSSxGQZpqVOYjjGTsjTj3WW5cjJBefIqUh FhMQ== 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=5TnLW0RVC/l/l6ZpSJGiQ9RS55Sh7Bww2u/zF6eZ2bY=; b=akn6kADY1ip1Mz9B0NiOvoIREuM2j1ibkE/nVpZ6Pl2Nw7akoutp5kQO/mFbyerzA5 aBXt/Dz+QvN3peTCR/cheF95eI+220bQT8PqHwt29E/dwEjVdpt6rRlbF/Up1OOrQCbN F+zvaSeSquiZqF2i1fcjL4PHBLfrvi4JDwhIa0g03vammJFDouF5wKuzSFxR8CTiYML2 Z4msqx54kbD4LdE4tQ8AV8D9h/2yTbVk1KCTsnLRrVbNbrL6VvQhfyXZ5VFBwDE2ji+1 HaH67m12J0IyFtX+jlqsY4a25gCbjKnsesgQW/jDdC0rI7yqH1WjyRgThc05dYN88TRa R2Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=KVQYSnSw; 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 21-20020a630515000000b004599c5f7d63si18426558pgf.857.2022.10.19.06.36.51; Wed, 19 Oct 2022 06:37:03 -0700 (PDT) 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=KVQYSnSw; 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 S231523AbiJSN1C (ORCPT + 99 others); Wed, 19 Oct 2022 09:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231466AbiJSN0f (ORCPT ); Wed, 19 Oct 2022 09:26:35 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED56212D836 for ; Wed, 19 Oct 2022 06:12:50 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id l1so17176938pld.13 for ; Wed, 19 Oct 2022 06:12:50 -0700 (PDT) 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=KVQYSnSwQFUiWWTDWziioJ8nATp3sFAA9sevKxCqCpQA/HkYqlZHsnoYXNx+Yg89JW ADG9MTT0eSgkBbdG4uNIHC0BxS6IlVAb0qXbDZVALJfkPpzjOxQ9HZImQWkLXn0lCImH B8I/RGkuYTGQ4oHXovOjUyfU12eWG8ApR2HNPlOZM+afMaQZxDgYdv2/eNG8XP0kg1WU MlmG+k+QdUIjiFsM8FlM0txbeRzB/ckeVWjS+nO3RKWD5gEtsLHS0uEnD+NYcTru45o/ 48Hwnn0X1r81gKz0TrPhcqp44nRpbh2ehIg6SW3Loxto5vQvZDkyKsNqMD+b3ZxODu76 9l9A== 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=0xs6wLbBYCRQ33hOCfsEf6gEcTARCveOdehfZ6Kb5DKVvo9BYxx+YLmlQ5djh3ZHfe I1iGc3FkfhcoII0aox6rWTGkZ57sGeBZi0SaHOUDngbOPCQNT3deyF1mZ2dKnyZTemsT eBnKVa9iQb8RqoLnrHCrmlMkBu3OVAvjaaVso9A9k4ogP44sIEEOc+iecsT8lyf+ETV0 Dh7OGGUE3U4/JXvGc/GGN5I3yhnxHXaDbuAAOtVzLoTdPuqfeI3zcvBE28b8McDL9OhQ xy29TTxodaoiafiQb/w1JyE3Sp7tAXlszkYFD2QgkanzU9rdnpVLzCNox/yRyZNevlxc w6ag== X-Gm-Message-State: ACrzQf3KtbgpSQBnK1XwLzJlN3tWaX2D3llTobHX6iMxwAamtVdInM8o xXUR1AeToFE5IS0tl6w4LQ/5Pw== X-Received: by 2002:a17:903:41c3:b0:17f:8def:dc92 with SMTP id u3-20020a17090341c300b0017f8defdc92mr8326965ple.7.1666185112189; Wed, 19 Oct 2022 06:11:52 -0700 (PDT) Received: from anup-ubuntu64-vm.. ([171.76.82.102]) by smtp.gmail.com with ESMTPSA id n12-20020a170902d2cc00b00172897952a0sm10934478plc.283.2022.10.19.06.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 06:11:51 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley Cc: Atish Patra , Heiko Stuebner , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH v4 4/4] RISC-V: Enable PMEM drivers Date: Wed, 19 Oct 2022 18:41:28 +0530 Message-Id: <20221019131128.237026-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019131128.237026-1-apatel@ventanamicro.com> References: <20221019131128.237026-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?1747123305333886030?= X-GMAIL-MSGID: =?utf-8?q?1747123305333886030?= We now have PMEM arch support available in RISC-V kernel so let us enable relevant drivers in defconfig. Signed-off-by: Anup Patel --- 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=y CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_CTRL=y CONFIG_RPMSG_VIRTIO=y +CONFIG_LIBNVDIMM=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y