Commit c4fc82bf authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

tco-test: fix up config accesses and re-enable 



The mistake that made the test fail was that it tried to
use a BAR address as an offset for config accesses to LPC.

Config accesses don't need a BAR, and LPC does not have one. Don't
attempt to map it.

With this change applied, TCO test passes, so re-enable it.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1e40356c

tests/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ check-qtest-i386-y += tests/i440fx-test$(EXESUF) 
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)

check-qtest-i386-y += tests/drive_del-test$(EXESUF)

check-qtest-i386-y += tests/wdt_ib700-test$(EXESUF)

#check-qtest-i386-y += tests/tco-test$(EXESUF)

check-qtest-i386-y += tests/tco-test$(EXESUF)

gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c

check-qtest-i386-y += $(check-qtest-pci-y)

gcov-files-i386-y += $(gcov-files-pci-y)

tests/tco-test.c

+3 −12
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ typedef struct { 
    const char *args;

    bool noreboot;

    QPCIDevice *dev;

    void *lpc_base;

    void *tco_io_base;

} TestData;
@@ -65,22 +64,14 @@ static void test_init(TestData *d) 
    d->dev = qpci_device_find(bus, QPCI_DEVFN(0x1f, 0x00));

    g_assert(d->dev != NULL);



    /* map PCI-to-LPC bridge interface BAR */

    d->lpc_base = qpci_iomap(d->dev, 0, NULL);



    qpci_device_enable(d->dev);



    g_assert(d->lpc_base != NULL);



    /* set ACPI PM I/O space base address */

    qpci_config_writel(d->dev, (uintptr_t)d->lpc_base + ICH9_LPC_PMBASE,

                       PM_IO_BASE_ADDR | 0x1);

    qpci_config_writel(d->dev, ICH9_LPC_PMBASE, PM_IO_BASE_ADDR | 0x1);

    /* enable ACPI I/O */

    qpci_config_writeb(d->dev, (uintptr_t)d->lpc_base + ICH9_LPC_ACPI_CTRL,

                       0x80);

    qpci_config_writeb(d->dev, ICH9_LPC_ACPI_CTRL, 0x80);

    /* set Root Complex BAR */

    qpci_config_writel(d->dev, (uintptr_t)d->lpc_base + ICH9_LPC_RCBA,

                       RCBA_BASE_ADDR | 0x1);

    qpci_config_writel(d->dev, ICH9_LPC_RCBA, RCBA_BASE_ADDR | 0x1);



    d->tco_io_base = (void *)((uintptr_t)PM_IO_BASE_ADDR + 0x60);

}