mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
546dbb0223
Starting with commit69a8b62a7a("riscv: acpi: avoid errors caused by probing DT devices when ACPI is used"), riscv images no longer populate devicetree if ACPI is enabled. This causes unit tests to fail which require the root node to be set. # Subtest: of_dtb # module: of_test 1..2 # of_dtb_root_node_found_by_path: EXPECTATION FAILED at drivers/of/of_test.c:21 Expected np is not null, but is # of_dtb_root_node_found_by_path: pass:0 fail:1 skip:0 total:1 not ok 1 of_dtb_root_node_found_by_path # of_dtb_root_node_populates_of_root: EXPECTATION FAILED at drivers/of/of_test.c:31 Expected of_root is not null, but is # of_dtb_root_node_populates_of_root: pass:0 fail:1 skip:0 total:1 not ok 2 of_dtb_root_node_populates_of_root Skip those tests for RISCV if the root node is not populated. Fixes:69a8b62a7a("riscv: acpi: avoid errors caused by probing DT devices when ACPI is used") Cc: Han Gao <rabenda.cn@gmail.com> Cc: Paul Walmsley <pjw@kernel.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Paul Walmsley <pjw@kernel.org> # arch/riscv Link: https://patch.msgid.link/20251023160415.705294-1-linux@roeck-us.net Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
94 lines
2.5 KiB
C
94 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Test managed DeviceTree APIs
|
|
*/
|
|
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
|
|
#include <kunit/of.h>
|
|
#include <kunit/test.h>
|
|
#include <kunit/resource.h>
|
|
|
|
#include "of_private.h"
|
|
|
|
/**
|
|
* of_root_kunit_skip() - Skip test if the root node isn't populated
|
|
* @test: test to skip if the root node isn't populated
|
|
*/
|
|
void of_root_kunit_skip(struct kunit *test)
|
|
{
|
|
if ((IS_ENABLED(CONFIG_ARM64) || IS_ENABLED(CONFIG_RISCV)) &&
|
|
IS_ENABLED(CONFIG_ACPI) && !of_root)
|
|
kunit_skip(test, "arm64/riscv+acpi doesn't populate a root node");
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_root_kunit_skip);
|
|
|
|
#if defined(CONFIG_OF_OVERLAY) && defined(CONFIG_OF_EARLY_FLATTREE)
|
|
|
|
static void of_overlay_fdt_apply_kunit_exit(void *ovcs_id)
|
|
{
|
|
of_overlay_remove(ovcs_id);
|
|
}
|
|
|
|
/**
|
|
* of_overlay_fdt_apply_kunit() - Test managed of_overlay_fdt_apply()
|
|
* @test: test context
|
|
* @overlay_fdt: device tree overlay to apply
|
|
* @overlay_fdt_size: size in bytes of @overlay_fdt
|
|
* @ovcs_id: identifier of overlay, used to remove the overlay
|
|
*
|
|
* Just like of_overlay_fdt_apply(), except the overlay is managed by the test
|
|
* case and is automatically removed with of_overlay_remove() after the test
|
|
* case concludes.
|
|
*
|
|
* Return: 0 on success, negative errno on failure
|
|
*/
|
|
int of_overlay_fdt_apply_kunit(struct kunit *test, void *overlay_fdt,
|
|
u32 overlay_fdt_size, int *ovcs_id)
|
|
{
|
|
int ret;
|
|
int *copy_id;
|
|
|
|
of_root_kunit_skip(test);
|
|
|
|
copy_id = kunit_kmalloc(test, sizeof(*copy_id), GFP_KERNEL);
|
|
if (!copy_id)
|
|
return -ENOMEM;
|
|
|
|
ret = of_overlay_fdt_apply(overlay_fdt, overlay_fdt_size,
|
|
ovcs_id, NULL);
|
|
if (ret)
|
|
return ret;
|
|
|
|
*copy_id = *ovcs_id;
|
|
|
|
return kunit_add_action_or_reset(test, of_overlay_fdt_apply_kunit_exit,
|
|
copy_id);
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_overlay_fdt_apply_kunit);
|
|
|
|
#endif
|
|
|
|
KUNIT_DEFINE_ACTION_WRAPPER(of_node_put_wrapper, of_node_put, struct device_node *);
|
|
|
|
/**
|
|
* of_node_put_kunit() - Test managed of_node_put()
|
|
* @test: test context
|
|
* @node: node to pass to `of_node_put()`
|
|
*
|
|
* Just like of_node_put(), except the node is managed by the test case and is
|
|
* automatically put with of_node_put() after the test case concludes.
|
|
*/
|
|
void of_node_put_kunit(struct kunit *test, struct device_node *node)
|
|
{
|
|
if (kunit_add_action(test, of_node_put_wrapper, node)) {
|
|
KUNIT_FAIL(test,
|
|
"Can't allocate a kunit resource to put of_node\n");
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_node_put_kunit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("Test managed DeviceTree APIs");
|