diff mbox

[06/30] test: usb: add port test to uhci unit test

Message ID 1411559299-19042-7-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov Sept. 24, 2014, 11:47 a.m. UTC 
along with it move common code fro ehci test to
a separate file to avoid duplication.
Later this code will be used for hotplug test.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/Makefile              |  5 +++--
 tests/test-usb-hcd-common.c | 37 +++++++++++++++++++++++++++++++++++++
 tests/test-usb-hcd-common.h | 13 +++++++++++++
 tests/usb-hcd-ehci-test.c   | 36 +++++-------------------------------
 tests/usb-hcd-uhci-test.c   | 18 ++++++++++++++++--
 5 files changed, 74 insertions(+), 35 deletions(-)
 create mode 100644 tests/test-usb-hcd-common.c
 create mode 100644 tests/test-usb-hcd-common.h

Comments

Gerd Hoffmann Sept. 24, 2014, 12:30 p.m. UTC | #1 
On Mi, 2014-09-24 at 11:47 +0000, Igor Mammedov wrote:
> along with it move common code fro ehci test to
> a separate file to avoid duplication.

Having the code mode as separate patch makes it easier to see the actual
port test added ...

> +static void test_port_1(void)
> +{
> +    QPCIBus *pcibus;
> +    struct qhc uhci;
> +
> +    pcibus = qpci_init_pc();
> +    g_assert(pcibus != NULL);
> +    usb_pci_init_one(pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
> +    uhci_port_test(&uhci, 0, UHCI_PORT_CCS);
>  }

... here.  Why test only one of the two ports btw?

cheers,
  Gerd
Igor Mammedov Sept. 24, 2014, 2:06 p.m. UTC | #2 
On Wed, 24 Sep 2014 14:30:25 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:

> On Mi, 2014-09-24 at 11:47 +0000, Igor Mammedov wrote:
> > along with it move common code fro ehci test to
> > a separate file to avoid duplication.
> 
> Having the code mode as separate patch makes it easier to see the actual
> port test added ...
I'll do it on respin.

> 
> > +static void test_port_1(void)
> > +{
> > +    QPCIBus *pcibus;
> > +    struct qhc uhci;
> > +
> > +    pcibus = qpci_init_pc();
> > +    g_assert(pcibus != NULL);
> > +    usb_pci_init_one(pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
> > +    uhci_port_test(&uhci, 0, UHCI_PORT_CCS);
> >  }
> 
> ... here.  Why test only one of the two ports btw?
Because I'd like to simplify* following hotplug test
that uses port 2, no other ill intentions so far.

*(use the same qtest_start(...) for all test until)
> 
> cheers,
>   Gerd
> 
>
diff mbox

Patch

diff --git a/tests/Makefile b/tests/Makefile
index f5de29c..06d7644 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -301,6 +301,7 @@  libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
 libqos-pc-obj-y += tests/libqos/malloc-pc.o
 libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
 libqos-virtio-obj-y = $(libqos-obj-y) $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o
+libqos-usb-obj-y = $(libqos-pc-obj-y) tests/test-usb-hcd-common.o
 
 tests/rtc-test$(EXESUF): tests/rtc-test.o
 tests/m48t59-test$(EXESUF): tests/m48t59-test.o
@@ -344,8 +345,8 @@  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-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o
-tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o
-tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-pc-obj-y)
+tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
+tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
 tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o
 tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y)
 tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
diff --git a/tests/test-usb-hcd-common.c b/tests/test-usb-hcd-common.c
new file mode 100644
index 0000000..547c3ac
--- /dev/null
+++ b/tests/test-usb-hcd-common.c
@@ -0,0 +1,37 @@ 
+/*
+ * common code shared by usb tests
+ *
+ * Copyright (c) 2014 Red Hat, Inc
+ *
+ * Authors:
+ *     Gerd Hoffmann <kraxel@redhat.com>
+ *     John Snow <jsnow@redhat.com>
+ *     Igor Mammedov <imammedo@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include <glib.h>
+#include <string.h>
+#include "libqtest.h"
+#include "qemu/osdep.h"
+#include "hw/usb/uhci-regs.h"
+#include "test-usb-hcd-common.h"
+
+void usb_pci_init_one(QPCIBus *pcibus, 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, NULL);
+    g_assert(hc->base != NULL);
+}
+
+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);
+
+    g_assert((value & mask) == (expect & mask));
+}
diff --git a/tests/test-usb-hcd-common.h b/tests/test-usb-hcd-common.h
new file mode 100644
index 0000000..2133702
--- /dev/null
+++ b/tests/test-usb-hcd-common.h
@@ -0,0 +1,13 @@ 
+#ifndef TEST_USB_HCD_COMMON_H
+#define TEST_USB_HCD_COMMON_H
+
+#include "libqos/pci-pc.h"
+
+struct qhc {
+    QPCIDevice *dev;
+    void *base;
+};
+
+void usb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar);
+void uhci_port_test(struct qhc *hc, int port, uint16_t expect);
+#endif
diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c
index c990492..b69ced5 100644
--- a/tests/usb-hcd-ehci-test.c
+++ b/tests/usb-hcd-ehci-test.c
@@ -15,11 +15,7 @@ 
 #include "qemu/osdep.h"
 #include "hw/usb/uhci-regs.h"
 #include "hw/usb/ehci-regs.h"
-
-struct qhc {
-    QPCIDevice *dev;
-    void *base;
-};
+#include "test-usb-hcd-common.h"
 
 static QPCIBus *pcibus;
 static struct qhc uhci1;
@@ -29,15 +25,6 @@  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, NULL);
-    g_assert(hc->base != NULL);
-}
-
 #if 0
 static void uhci_port_update(struct qhc *hc, int port,
                              uint16_t set, uint16_t clear)
@@ -52,19 +39,6 @@  static void uhci_port_update(struct qhc *hc, int port,
 }
 #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;
@@ -88,10 +62,10 @@  static void pci_init(void)
     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);
+    usb_pci_init_one(pcibus, &uhci1, QPCI_DEVFN(0x1d, 0), 4);
+    usb_pci_init_one(pcibus, &uhci2, QPCI_DEVFN(0x1d, 1), 4);
+    usb_pci_init_one(pcibus, &uhci3, QPCI_DEVFN(0x1d, 2), 4);
+    usb_pci_init_one(pcibus, &ehci1, QPCI_DEVFN(0x1d, 7), 0);
 }
 
 static void pci_uhci_port_1(void)
diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c
index 94e858f..4a67c9f 100644
--- a/tests/usb-hcd-uhci-test.c
+++ b/tests/usb-hcd-uhci-test.c
@@ -11,13 +11,23 @@ 
 #include <string.h>
 #include "libqtest.h"
 #include "qemu/osdep.h"
+#include "test-usb-hcd-common.h"
+#include "hw/usb/uhci-regs.h"
 
 
 static void test_uhci_init(void)
 {
-    qtest_start("-device piix3-usb-uhci,id=uhci");
+}
 
-    qtest_end();
+static void test_port_1(void)
+{
+    QPCIBus *pcibus;
+    struct qhc uhci;
+
+    pcibus = qpci_init_pc();
+    g_assert(pcibus != NULL);
+    usb_pci_init_one(pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
+    uhci_port_test(&uhci, 0, UHCI_PORT_CCS);
 }
 
 
@@ -28,8 +38,12 @@  int main(int argc, char **argv)
     g_test_init(&argc, &argv, NULL);
 
     qtest_add_func("/uhci/pci/init", test_uhci_init);
+    qtest_add_func("/uhci/pci/port1", test_port_1);
 
+    qtest_start("-device piix3-usb-uhci,id=uhci,addr=1d.0"
+                " -device usb-tablet,bus=uhci.0,port=1");
     ret = g_test_run();
+    qtest_end();
 
     return ret;
 }