dm: test: Add test for device removal

Add a test for the correct device removal. Currently two different ways
for device removal are supported:

- Normal device removal via the device_remove() API
- Removal via selective device driver flags (DM_FLAG_ACTIVE_DMA)

This new test "remove_active_dma" adds tests cases for those both ways
of removal. This is done by adding a new test driver, which has this
flag set.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
master
Stefan Roese 8 years ago committed by Simon Glass
parent 1b8220aa2a
commit 24f927c527
  1. 66
      test/dm/core.c
  2. 11
      test/dm/test-driver.c

@ -67,6 +67,10 @@ static struct driver_info driver_info_pre_reloc = {
.platdata = &test_pdata_pre_reloc,
};
static struct driver_info driver_info_act_dma = {
.name = "test_act_dma_drv",
};
void dm_leak_check_start(struct unit_test_state *uts)
{
uts->start = mallinfo();
@ -656,6 +660,68 @@ static int dm_test_pre_reloc(struct unit_test_state *uts)
}
DM_TEST(dm_test_pre_reloc, 0);
/*
* Test that removal of devices, either via the "normal" device_remove()
* API or via the device driver selective flag works as expected
*/
static int dm_test_remove_active_dma(struct unit_test_state *uts)
{
struct dm_test_state *dms = uts->priv;
struct udevice *dev;
ut_assertok(device_bind_by_name(dms->root, false, &driver_info_act_dma,
&dev));
ut_assert(dev);
/* Probe the device */
ut_assertok(device_probe(dev));
/* Test if device is active right now */
ut_asserteq(true, device_active(dev));
/* Remove the device via selective remove flag */
dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL);
/* Test if device is inactive right now */
ut_asserteq(false, device_active(dev));
/* Probe the device again */
ut_assertok(device_probe(dev));
/* Test if device is active right now */
ut_asserteq(true, device_active(dev));
/* Remove the device via "normal" remove API */
ut_assertok(device_remove(dev, DM_REMOVE_NORMAL));
/* Test if device is inactive right now */
ut_asserteq(false, device_active(dev));
/*
* Test if a device without the active DMA flags is not removed upon
* the active DMA remove call
*/
ut_assertok(device_unbind(dev));
ut_assertok(device_bind_by_name(dms->root, false, &driver_info_manual,
&dev));
ut_assert(dev);
/* Probe the device */
ut_assertok(device_probe(dev));
/* Test if device is active right now */
ut_asserteq(true, device_active(dev));
/* Remove the device via selective remove flag */
dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL);
/* Test if device is still active right now */
ut_asserteq(true, device_active(dev));
return 0;
}
DM_TEST(dm_test_remove_active_dma, 0);
static int dm_test_uclass_before_ready(struct unit_test_state *uts)
{
struct uclass *uc;

@ -157,3 +157,14 @@ U_BOOT_DRIVER(test_pre_reloc_drv) = {
.unbind = test_manual_unbind,
.flags = DM_FLAG_PRE_RELOC,
};
U_BOOT_DRIVER(test_act_dma_drv) = {
.name = "test_act_dma_drv",
.id = UCLASS_TEST,
.ops = &test_manual_ops,
.bind = test_manual_bind,
.probe = test_manual_probe,
.remove = test_manual_remove,
.unbind = test_manual_unbind,
.flags = DM_FLAG_ACTIVE_DMA,
};

Loading…
Cancel
Save