Commit d81d4106 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb: improve ehci/uhci test 



 * Attach usb devices to the bus.
 * Check initial port status register state.
 * Flip ehci initialization bit.
 * Check port status register state again to
   see whenever device handover to ehci worked.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 381626a9

tests/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ gcov-files-i386-y += hw/pci-bridge/ioh3420.c 
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)

gcov-files-i386-y += hw/usb/hcd-ehci.c

gcov-files-i386-y += hw/usb/hcd-uhci.c

gcov-files-i386-y += hw/usb/dev-hid.c

gcov-files-i386-y += hw/usb/dev-storage.c

check-qtest-x86_64-y = $(check-qtest-i386-y)

gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c

gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
@@ -319,7 +321,7 @@ tests/ac97-test$(EXESUF): tests/ac97-test.o 
tests/es1370-test$(EXESUF): tests/es1370-test.o

tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o

tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o

tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o

tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-pc-obj-y)

tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o

tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a libqemustub.a

tests/usb-hcd-ehci-test.c

+149 −4
Original line number Diff line number Diff line
@@ -9,12 +9,149 @@ 


#include <glib.h>

#include <string.h>

#include <stdio.h>

#include "libqtest.h"

#include "libqos/pci-pc.h"

#include "qemu/osdep.h"

#include "hw/usb/uhci-regs.h"

#include "hw/usb/ehci-regs.h"



/* Tests only initialization so far. TODO: Replace with functional tests */

static void pci_nop(void)

struct qhc {

    QPCIDevice *dev;

    void *base;

};



static QPCIBus *pcibus;

static struct qhc uhci1;

static struct qhc uhci2;

static struct qhc uhci3;

static struct qhc ehci1;



/* helpers */



static void pci_init_one(struct qhc *hc, uint32_t devfn, int bar)

{

    hc->dev = qpci_device_find(pcibus, devfn);

    g_assert(hc->dev != NULL);

    qpci_device_enable(hc->dev);

    hc->base = qpci_iomap(hc->dev, bar);

    g_assert(hc->base != NULL);

}



#if 0

static void uhci_port_update(struct qhc *hc, int port,

                             uint16_t set, uint16_t clear)

{

    void *addr = hc->base + 0x10 + 2 * port;

    uint16_t value;



    value = qpci_io_readw(hc->dev, addr);

    value |= set;

    value &= ~clear;

    qpci_io_writew(hc->dev, addr, value);

}

#endif



static void uhci_port_test(struct qhc *hc, int port, uint16_t expect)

{

    void *addr = hc->base + 0x10 + 2 * port;

    uint16_t value = qpci_io_readw(hc->dev, addr);

    uint16_t mask = ~(UHCI_PORT_WRITE_CLEAR | UHCI_PORT_RSVD1);



#if 0

    fprintf(stderr, "%s: %d, have 0x%04x, want 0x%04x\n",

            __func__, port, value & mask, expect & mask);

#endif

    g_assert((value & mask) == (expect & mask));

}



static void ehci_port_test(struct qhc *hc, int port, uint32_t expect)

{

    void *addr = hc->base + 0x64 + 4 * port;

    uint32_t value = qpci_io_readl(hc->dev, addr);

    uint16_t mask = ~(PORTSC_CSC | PORTSC_PEDC | PORTSC_OCC);



#if 0

    fprintf(stderr, "%s: %d, have 0x%08x, want 0x%08x\n",

            __func__, port, value & mask, expect & mask);

#endif

    g_assert((value & mask) == (expect & mask));

}



/* tests */



static void pci_init(void)

{

    if (pcibus) {

        return;

    }

    pcibus = qpci_init_pc();

    g_assert(pcibus != NULL);



    pci_init_one(&uhci1, QPCI_DEVFN(0x1d, 0), 4);

    pci_init_one(&uhci2, QPCI_DEVFN(0x1d, 1), 4);

    pci_init_one(&uhci3, QPCI_DEVFN(0x1d, 2), 4);

    pci_init_one(&ehci1, QPCI_DEVFN(0x1d, 7), 0);

}



static void pci_uhci_port_1(void)

{

    g_assert(pcibus != NULL);



    uhci_port_test(&uhci1, 0, UHCI_PORT_CCS); /* usb-tablet  */

    uhci_port_test(&uhci1, 1, UHCI_PORT_CCS); /* usb-storage */

    uhci_port_test(&uhci2, 0, 0);

    uhci_port_test(&uhci2, 1, 0);

    uhci_port_test(&uhci3, 0, 0);

    uhci_port_test(&uhci3, 1, 0);

}



static void pci_ehci_port_1(void)

{

    int i;



    g_assert(pcibus != NULL);



    for (i = 0; i < 6; i++) {

        ehci_port_test(&ehci1, i, PORTSC_POWNER | PORTSC_PPOWER);

    }

}



static void pci_ehci_config(void)

{

    /* hands over all ports from companion uhci to ehci */

    qpci_io_writew(ehci1.dev, ehci1.base + 0x60, 1);

}



static void pci_uhci_port_2(void)

{

    g_assert(pcibus != NULL);



    uhci_port_test(&uhci1, 0, 0); /* usb-tablet,  @ehci */

    uhci_port_test(&uhci1, 1, 0); /* usb-storage, @ehci */

    uhci_port_test(&uhci2, 0, 0);

    uhci_port_test(&uhci2, 1, 0);

    uhci_port_test(&uhci3, 0, 0);

    uhci_port_test(&uhci3, 1, 0);

}



static void pci_ehci_port_2(void)

{

    static uint32_t expect[] = {

        PORTSC_PPOWER | PORTSC_CONNECT, /* usb-tablet  */

        PORTSC_PPOWER | PORTSC_CONNECT, /* usb-storage */

        PORTSC_PPOWER,

        PORTSC_PPOWER,

        PORTSC_PPOWER,

        PORTSC_PPOWER,

    };

    int i;



    g_assert(pcibus != NULL);



    for (i = 0; i < 6; i++) {

        ehci_port_test(&ehci1, i, expect[i]);

    }

}



int main(int argc, char **argv)
@@ -22,7 +159,12 @@ int main(int argc, char **argv) 
    int ret;



    g_test_init(&argc, &argv, NULL);

    qtest_add_func("/ehci/pci/nop", pci_nop);

    qtest_add_func("/ehci/pci/init", pci_init);

    qtest_add_func("/ehci/pci/uhci-port-1", pci_uhci_port_1);

    qtest_add_func("/ehci/pci/ehci-port-1", pci_ehci_port_1);

    qtest_add_func("/ehci/pci/ehci-config", pci_ehci_config);

    qtest_add_func("/ehci/pci/uhci-port-2", pci_uhci_port_2);

    qtest_add_func("/ehci/pci/ehci-port-2", pci_ehci_port_2);



    qtest_start("-machine q35 -device ich9-usb-ehci1,bus=pcie.0,addr=1d.7,"

                "multifunction=on,id=ich9-ehci-1 "
@@ -31,7 +173,10 @@ int main(int argc, char **argv) 
                "-device ich9-usb-uhci2,bus=pcie.0,addr=1d.1,"

                "multifunction=on,masterbus=ich9-ehci-1.0,firstport=2 "

                "-device ich9-usb-uhci3,bus=pcie.0,addr=1d.2,"

                "multifunction=on,masterbus=ich9-ehci-1.0,firstport=4");

                "multifunction=on,masterbus=ich9-ehci-1.0,firstport=4 "

                "-drive if=none,id=usbcdrom,media=cdrom "

                "-device usb-tablet,bus=ich9-ehci-1.0,port=1,usb_version=1 "

                "-device usb-storage,bus=ich9-ehci-1.0,port=2,drive=usbcdrom ");

    ret = g_test_run();



    qtest_end();