Skip to content

Commit 7914992

Browse files
committed
cxl/port: Quiet warning messages from the cxl_test environment
The cxl_test platform device CXL port hierarchy is useful for testing, but throws warning messages of the form: cxl_mem mem2: at cxl_root_port.1 no parent for dport: platform cxl_mem mem3: at cxl_root_port.2 no parent for dport: platform cxl_mem mem4: at cxl_root_port.3 no parent for dport: platform cxl_mem mem5: at cxl_root_port.0 no parent for dport: platform cxl_mem mem6: at cxl_root_port.1 no parent for dport: platform cxl_mem mem7: at cxl_root_port.2 no parent for dport: platform cxl_mem mem8: at cxl_root_port.3 no parent for dport: platform cxl_mem mem9: at cxl_root_port.4 no parent for dport: platform cxl_mem mem10: at cxl_root_port.4 no parent for dport: platform ...and this message when running testing in QEMU: cxl_region region4: Bypassing cpu_cache_invalidate_memregion() for testing! Noisy cxl_test warnings have caused other regressions to be missed. In the interest of using cxl_test for early detection of dev_err() and dev_warn() messages, silence platform device topology and cache-invalidation messages. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 18f35dc commit 7914992

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

drivers/cxl/core/port.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/* Copyright(c) 2020 Intel Corporation. All rights reserved. */
3+
#include <linux/platform_device.h>
34
#include <linux/memregion.h>
45
#include <linux/workqueue.h>
56
#include <linux/debugfs.h>
@@ -1463,7 +1464,11 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd)
14631464
struct cxl_dport *dport;
14641465
struct cxl_port *port;
14651466

1466-
if (!dport_dev)
1467+
/*
1468+
* The terminal "grandparent" in PCI is NULL and @platform_bus
1469+
* for platform devices
1470+
*/
1471+
if (!dport_dev || dport_dev == &platform_bus)
14671472
return 0;
14681473

14691474
uport_dev = dport_dev->parent;

drivers/cxl/core/region.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static int cxl_region_invalidate_memregion(struct cxl_region *cxlr)
129129
{
130130
if (!cpu_cache_has_invalidate_memregion()) {
131131
if (IS_ENABLED(CONFIG_CXL_REGION_INVALIDATION_TEST)) {
132-
dev_warn_once(
132+
dev_info_once(
133133
&cxlr->dev,
134134
"Bypassing cpu_cache_invalidate_memregion() for testing!\n");
135135
return 0;

0 commit comments

Comments
 (0)