So far we missed the testing for PCI configuration space access. This adds tests for it, as well as removing some redundant asserts.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Simon Glass sjg@chromium.org
---
Changes in v3: - Update commit message to mention removing redundant asserts
Changes in v2: None
test/dm/pci.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/test/dm/pci.c b/test/dm/pci.c index 727ec34..089b72e 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <asm/io.h> +#include <asm/test.h> #include <dm/test.h> #include <test/ut.h>
@@ -24,27 +25,32 @@ DM_TEST(dm_test_pci_base, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); static int dm_test_pci_busdev(struct unit_test_state *uts) { struct udevice *bus; - struct udevice *emul, *swap; + struct udevice *swap; + u16 vendor, device;
/* Test bus#0 and its devices */ ut_assertok(uclass_get_device_by_seq(UCLASS_PCI, 0, &bus));
- ut_assertok(uclass_get_device(UCLASS_PCI_EMUL, 0, &emul)); ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(0, 0x00, 0), &swap)); - ut_assert(device_active(swap)); - ut_assertok(uclass_get_device(UCLASS_PCI_EMUL, 1, &emul)); + vendor = 0; + ut_assertok(dm_pci_read_config16(swap, PCI_VENDOR_ID, &vendor)); + ut_asserteq(SANDBOX_PCI_VENDOR_ID, vendor); ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(0, 0x1f, 0), &swap)); - ut_assert(device_active(swap)); + device = 0; + ut_assertok(dm_pci_read_config16(swap, PCI_DEVICE_ID, &device)); + ut_asserteq(SANDBOX_PCI_DEVICE_ID, device);
/* Test bus#1 and its devices */ ut_assertok(uclass_get_device_by_seq(UCLASS_PCI, 1, &bus));
- ut_assertok(uclass_get_device(UCLASS_PCI_EMUL, 2, &emul)); ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(1, 0x08, 0), &swap)); - ut_assert(device_active(swap)); - ut_assertok(uclass_get_device(UCLASS_PCI_EMUL, 3, &emul)); + vendor = 0; + ut_assertok(dm_pci_read_config16(swap, PCI_VENDOR_ID, &vendor)); + ut_asserteq(SANDBOX_PCI_VENDOR_ID, vendor); ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(1, 0x0c, 0), &swap)); - ut_assert(device_active(swap)); + device = 0; + ut_assertok(dm_pci_read_config16(swap, PCI_DEVICE_ID, &device)); + ut_asserteq(SANDBOX_PCI_DEVICE_ID, device);
return 0; }