From patchwork Mon Dec 19 19:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 34741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2587243wrn; Mon, 19 Dec 2022 11:58:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuZoER45WBrCX7gw271GcP+gj7XmEH23kFi5IrZqEohADgRpV5G9LLmcK/9x+v1aPvDB7RZ X-Received: by 2002:a17:90a:d182:b0:223:b1e3:997f with SMTP id fu2-20020a17090ad18200b00223b1e3997fmr8503216pjb.48.1671479936681; Mon, 19 Dec 2022 11:58:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671479936; cv=none; d=google.com; s=arc-20160816; b=Oj84FK3IeCUoGBcPklNQktPvGt+1GIqz0MZUXgw/hDNbMip2c1Vs2S2Cyw0Lrw5EbE Y3cADujEkbRU+rRA+pukoGdLW83uWuyivNsKC1/usJrY3X+SeeN6jWR5kakjY9wfRtVQ pNa0m97quW5Gv166aZl56W9sDY/boW4Yc201phNG/neh0h+f7T+QiM52X+xxFRavRwDa AZFnlVFvVljhWR8Zl4h5jMien36Ix3dN8w3ATh41DnVhgUCg6SNbUijBSRzRi2mQwEjb vFiOVydeoN0ZCG+MY09Zhh2HHIjohuY/yuA426GI3HYTaABfbUQqJbyM4wDscIYmNJFp Ppsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=klZAlP1kOUp7wpdZeL5YEyJd1NOcY1vneGW37Msxzjw=; b=Hv0ZfhOK+EzQ8HkiP4hgLDJk21PRFOJk6HjqifWe06N7ybaqNjBDo/1ipCuKovkxrq YAei576XmBfQrt2rnSvW8n0WL+/7NG0ZynR+tODZB0zHrjdB71AVHCeuhIPieuYKkfsG LR575TBGdoYolyqvXdQ+2OmaZyD9kXLOWHHF/stx3muzpgD0P16LAxr/r0cZZ1f78Pnd jPzmuFiZ7xuU8sOCkQAFaY+XzHYqw4cLh0GjHIq4l3a2/jPdm7+qjvLXO1QWS//RwpPE abUNBjWfDD8Ha1JePSi7pYGiLoHSbmnTYXwc0FdaMd1s3ufJaID4Xw4TtE/AgCqj+xRp Gifg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zEEU2qsp; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gj16-20020a17090b109000b0021910b7ae96si15771124pjb.60.2022.12.19.11.58.43; Mon, 19 Dec 2022 11:58:56 -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=@infradead.org header.s=bombadil.20210309 header.b=zEEU2qsp; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232496AbiLST4f (ORCPT + 99 others); Mon, 19 Dec 2022 14:56:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232464AbiLST4a (ORCPT ); Mon, 19 Dec 2022 14:56:30 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21062DEE7; Mon, 19 Dec 2022 11:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=klZAlP1kOUp7wpdZeL5YEyJd1NOcY1vneGW37Msxzjw=; b=zEEU2qspZ4u/6ELaYbnpp78VmU GLEoJRvumw95axpcRtNDMP/P+JPKcvMQZ1gycML+Hjhd+SH5I7pv1c/brFef8Ava5AUAq2d4j9Vic G+f+Kthek418tixMVMw67hbN0yLX1+m7RFNzuOZBTDOq/uf6/y78uQ4T+pNlm8TH1HQv6L+94Mh72 iC2J0WvTJqmpiSv9GM3oHlLl/IC92+ZPj5rR/ATydJ/yOq3aM0nFYuYUxC2caNQ+n1aQGagHK84G8 kO0PWwOApi0omv+yHFytr2/yAMeEK7o2T4PAl++2WkBEJ/Mn5CkG/Je1NZ9ix7twkuPCZzh4F745E 6CRIjONg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p7MFJ-001TSF-BY; Mon, 19 Dec 2022 19:56:25 +0000 From: Luis Chamberlain To: alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, bwidawsk@kernel.org, dan.j.williams@intel.com Cc: dave@stgolabs.net, a.manzanares@samsung.com, mcgrof@kernel.org, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cxl_test: remove nvdimm requirement Date: Mon, 19 Dec 2022 11:56:20 -0800 Message-Id: <20221219195620.351544-1-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE 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?1752673746015254777?= X-GMAIL-MSGID: =?utf-8?q?1752673746015254777?= There is no need for NVDIMM to test CXL, so remove this requirement. Signed-off-by: Luis Chamberlain --- tools/testing/cxl/config_check.c | 2 -- tools/testing/cxl/test/mock.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/cxl/config_check.c b/tools/testing/cxl/config_check.c index 99b56b5f6edf..cef5f1159ba7 100644 --- a/tools/testing/cxl/config_check.c +++ b/tools/testing/cxl/config_check.c @@ -10,7 +10,5 @@ void check(void) BUILD_BUG_ON(!IS_ENABLED(CONFIG_64BIT)); BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_BUS)); BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_ACPI)); - BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_PMEM)); BUILD_BUG_ON(!IS_ENABLED(CONFIG_CXL_REGION_INVALIDATION_TEST)); - BUILD_BUG_ON(!IS_ENABLED(CONFIG_NVDIMM_SECURITY_TEST)); } diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c index 5dface08e0de..7c71826f1aac 100644 --- a/tools/testing/cxl/test/mock.c +++ b/tools/testing/cxl/test/mock.c @@ -116,6 +116,7 @@ struct acpi_pci_root *__wrap_acpi_pci_find_root(acpi_handle handle) } EXPORT_SYMBOL_GPL(__wrap_acpi_pci_find_root); +#ifdef CONFIG_CXL_PMEM struct nvdimm_bus * __wrap_nvdimm_bus_register(struct device *dev, struct nvdimm_bus_descriptor *nd_desc) @@ -130,6 +131,7 @@ __wrap_nvdimm_bus_register(struct device *dev, return nvdimm_bus_register(dev, nd_desc); } EXPORT_SYMBOL_GPL(__wrap_nvdimm_bus_register); +#endif struct cxl_hdm *__wrap_devm_cxl_setup_hdm(struct cxl_port *port) {