Message ID | 1543851204-41186-23-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
Series | qtest: qgraph driver framework | expand |
On 12/3/18 4:32 PM, Paolo Bonzini wrote: > From: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> > > Add qgraph nodes for sdhci-pci and generic-sdhci (memory mapped) drivers. > Both drivers implement (produce) the same interface sdhci, that provides the > readw - readq - writeq functions. > > Signed-off-by: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > tests/Makefile.include | 1 + > tests/libqos/sdhci.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/libqos/sdhci.h | 70 +++++++++++++++++++++ > 3 files changed, 234 insertions(+) > create mode 100644 tests/libqos/sdhci.c > create mode 100644 tests/libqos/sdhci.h > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 1266109..66c7848 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -678,6 +678,7 @@ libqos-virtio-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/virt > # Devices > qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) > qos-test-obj-y += $(libqos-pc-obj-y) > +qos-test-obj-y += tests/libqos/sdhci.o > > # Machines > qos-test-obj-y += tests/libqos/x86_64_pc-machine.o > diff --git a/tests/libqos/sdhci.c b/tests/libqos/sdhci.c > new file mode 100644 > index 0000000..0685bee > --- /dev/null > +++ b/tests/libqos/sdhci.c > @@ -0,0 +1,163 @@ > +/* > + * libqos driver framework > + * > + * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License version 2 as published by the Free Software Foundation. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/> > + */ > + > +#include "qemu/osdep.h" > +#include "libqtest.h" > +#include "libqos/qgraph.h" > +#include "pci.h" > +#include "sdhci.h" > +#include "hw/pci/pci.h" > + > +static void set_qsdhci_fields(QSDHCI *s, uint8_t version, uint8_t baseclock, > + bool sdma, uint64_t reg) > +{ > + s->props.version = version; > + s->props.baseclock = baseclock; > + s->props.capab.sdma = sdma; > + s->props.capab.reg = reg; > +} > + > +/* Memory mapped implementation of QSDHCI */ > + > +static uint16_t sdhci_mm_readw(QSDHCI *s, uint32_t reg) > +{ > + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); > + return qtest_readw(smm->qts, smm->addr + reg); > +} > + > +static uint64_t sdhci_mm_readq(QSDHCI *s, uint32_t reg) > +{ > + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); > + return qtest_readq(smm->qts, smm->addr + reg); > +} > + > +static void sdhci_mm_writeq(QSDHCI *s, uint32_t reg, uint64_t val) > +{ > + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); > + qtest_writeq(smm->qts, smm->addr + reg, val); > +} > + > +static void *sdhci_mm_get_driver(void *obj, const char *interface) > +{ > + QSDHCI_MemoryMapped *smm = obj; > + if (!g_strcmp0(interface, "sdhci")) { > + return &smm->sdhci; > + } > + fprintf(stderr, "%s not present in generic-sdhci\n", interface); > + g_assert_not_reached(); > +} > + > +void qos_init_sdhci_mm(QSDHCI_MemoryMapped *sdhci, QTestState *qts, > + uint32_t addr, QSDHCIProperties *common) > +{ > + sdhci->obj.get_driver = sdhci_mm_get_driver; > + sdhci->sdhci.readw = sdhci_mm_readw; > + sdhci->sdhci.readq = sdhci_mm_readq; > + sdhci->sdhci.writeq = sdhci_mm_writeq; > + memcpy(&sdhci->sdhci.props, common, sizeof(QSDHCIProperties)); > + sdhci->addr = addr; > + sdhci->qts = qts; > +} > + > +/* PCI implementation of QSDHCI */ > + > +static uint16_t sdhci_pci_readw(QSDHCI *s, uint32_t reg) > +{ > + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); > + return qpci_io_readw(&spci->dev, spci->mem_bar, reg); > +} > + > +static uint64_t sdhci_pci_readq(QSDHCI *s, uint32_t reg) > +{ > + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); > + return qpci_io_readq(&spci->dev, spci->mem_bar, reg); > +} > + > +static void sdhci_pci_writeq(QSDHCI *s, uint32_t reg, uint64_t val) > +{ > + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); > + return qpci_io_writeq(&spci->dev, spci->mem_bar, reg, val); > +} > + > +static void *sdhci_pci_get_driver(void *object, const char *interface) > +{ > + QSDHCI_PCI *spci = object; > + if (!g_strcmp0(interface, "sdhci")) { > + return &spci->sdhci; > + } > + > + fprintf(stderr, "%s not present in sdhci-pci\n", interface); > + g_assert_not_reached(); > +} > + > +static void sdhci_pci_start_hw(QOSGraphObject *obj) > +{ > + QSDHCI_PCI *spci = (QSDHCI_PCI *)obj; > + qpci_device_enable(&spci->dev); > +} > + > +static void sdhci_destructor(QOSGraphObject *obj) sdhci_pci_destructor() > +{ > + QSDHCI_PCI *spci = (QSDHCI_PCI *)obj; > + qpci_iounmap(&spci->dev, spci->mem_bar); > +} > + > +static void *sdhci_pci_create(void *pci_bus, QGuestAllocator *alloc, void *addr) > +{ > + QSDHCI_PCI *spci = g_new0(QSDHCI_PCI, 1); > + QPCIBus *bus = pci_bus; > + uint64_t barsize; > + > + qpci_device_init(&spci->dev, bus, addr); > + spci->mem_bar = qpci_iomap(&spci->dev, 0, &barsize); > + spci->sdhci.readw = sdhci_pci_readw; > + spci->sdhci.readq = sdhci_pci_readq; > + spci->sdhci.writeq = sdhci_pci_writeq; > + set_qsdhci_fields(&spci->sdhci, 2, 0, 1, 0x057834b4); > + > + spci->obj.get_driver = sdhci_pci_get_driver; > + spci->obj.start_hw = sdhci_pci_start_hw; > + spci->obj.destructor = sdhci_destructor; > + return &spci->obj; > +} > + > +static void qsdhci_register_nodes(void) > +{ > + QPCIAddress addr = { > + .devfn = QPCI_DEVFN(4, 0), > + .vendor_id = PCI_VENDOR_ID_REDHAT, > + .device_id = PCI_DEVICE_ID_REDHAT_SDHCI, > + }; > + > + QOSGraphEdgeOptions opts = { > + .extra_device_opts = "addr=04.0", Shouldn't this be formatted from the previous QPCIAddress? > + }; > + > + /* generic-sdhci */ > + qos_node_create_driver("generic-sdhci", NULL); > + qos_node_produces("generic-sdhci", "sdhci"); > + > + /* sdhci-pci */ > + add_qpci_address(&opts, &addr); > + qos_node_create_driver("sdhci-pci", sdhci_pci_create); > + qos_node_produces("sdhci-pci", "sdhci"); > + qos_node_consumes("sdhci-pci", "pci-bus", &opts); > + > +} > + > +libqos_init(qsdhci_register_nodes); > diff --git a/tests/libqos/sdhci.h b/tests/libqos/sdhci.h > new file mode 100644 > index 0000000..e9880fc > --- /dev/null > +++ b/tests/libqos/sdhci.h > @@ -0,0 +1,70 @@ > +/* > + * libqos driver framework > + * > + * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License version 2 as published by the Free Software Foundation. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/> > + */ > + > +#ifndef QGRAPH_QSDHCI > +#define QGRAPH_QSDHCI > + > +#include "libqos/qgraph.h" > +#include "pci.h" > + > +typedef struct QSDHCI QSDHCI; > +typedef struct QSDHCI_MemoryMapped QSDHCI_MemoryMapped; > +typedef struct QSDHCI_PCI QSDHCI_PCI; > +typedef struct QSDHCIProperties QSDHCIProperties; > + > +/* Properties common to all QSDHCI devices */ > +struct QSDHCIProperties { > + uint8_t version; > + uint8_t baseclock; > + struct { > + bool sdma; > + uint64_t reg; > + } capab; > +}; > + > +struct QSDHCI { > + uint16_t (*readw)(QSDHCI *s, uint32_t reg); > + uint64_t (*readq)(QSDHCI *s, uint32_t reg); > + void (*writeq)(QSDHCI *s, uint32_t reg, uint64_t val); > + QSDHCIProperties props; > +}; > + > +/* Memory Mapped implementation of QSDHCI */ > +struct QSDHCI_MemoryMapped { > + QOSGraphObject obj; > + QTestState *qts; Maybe 'teststate' or 'state' rather than 'qts'. > + QSDHCI sdhci; > + uint64_t addr; > +}; > + > +/* PCI implementation of QSDHCI */ > +struct QSDHCI_PCI { > + QOSGraphObject obj; > + QPCIDevice dev; > + QSDHCI sdhci; > + QPCIBar mem_bar; > +}; > + > +/** > + * qos_init_sdhci_mm(): external constructor used by all drivers/machines > + * that "contain" a #QSDHCI_MemoryMapped driver > + */ > +void qos_init_sdhci_mm(QSDHCI_MemoryMapped *sdhci, QTestState *qts, > + uint32_t addr, QSDHCIProperties *common); > + > +#endif > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 12/12/18 15:35, Philippe Mathieu-Daudé wrote: >> +} >> + >> +static void qsdhci_register_nodes(void) >> +{ >> + QPCIAddress addr = { >> + .devfn = QPCI_DEVFN(4, 0), >> + .vendor_id = PCI_VENDOR_ID_REDHAT, >> + .device_id = PCI_DEVICE_ID_REDHAT_SDHCI, >> + }; >> + >> + QOSGraphEdgeOptions opts = { >> + .extra_device_opts = "addr=04.0", > Shouldn't this be formatted from the previous QPCIAddress? > Maybe, but there isn't a way to couple the two for now. A device address allocator is on the todo list. :) Paolo
diff --git a/tests/Makefile.include b/tests/Makefile.include index 1266109..66c7848 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -678,6 +678,7 @@ libqos-virtio-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/virt # Devices qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y) qos-test-obj-y += $(libqos-pc-obj-y) +qos-test-obj-y += tests/libqos/sdhci.o # Machines qos-test-obj-y += tests/libqos/x86_64_pc-machine.o diff --git a/tests/libqos/sdhci.c b/tests/libqos/sdhci.c new file mode 100644 index 0000000..0685bee --- /dev/null +++ b/tests/libqos/sdhci.c @@ -0,0 +1,163 @@ +/* + * libqos driver framework + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ + +#include "qemu/osdep.h" +#include "libqtest.h" +#include "libqos/qgraph.h" +#include "pci.h" +#include "sdhci.h" +#include "hw/pci/pci.h" + +static void set_qsdhci_fields(QSDHCI *s, uint8_t version, uint8_t baseclock, + bool sdma, uint64_t reg) +{ + s->props.version = version; + s->props.baseclock = baseclock; + s->props.capab.sdma = sdma; + s->props.capab.reg = reg; +} + +/* Memory mapped implementation of QSDHCI */ + +static uint16_t sdhci_mm_readw(QSDHCI *s, uint32_t reg) +{ + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); + return qtest_readw(smm->qts, smm->addr + reg); +} + +static uint64_t sdhci_mm_readq(QSDHCI *s, uint32_t reg) +{ + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); + return qtest_readq(smm->qts, smm->addr + reg); +} + +static void sdhci_mm_writeq(QSDHCI *s, uint32_t reg, uint64_t val) +{ + QSDHCI_MemoryMapped *smm = container_of(s, QSDHCI_MemoryMapped, sdhci); + qtest_writeq(smm->qts, smm->addr + reg, val); +} + +static void *sdhci_mm_get_driver(void *obj, const char *interface) +{ + QSDHCI_MemoryMapped *smm = obj; + if (!g_strcmp0(interface, "sdhci")) { + return &smm->sdhci; + } + fprintf(stderr, "%s not present in generic-sdhci\n", interface); + g_assert_not_reached(); +} + +void qos_init_sdhci_mm(QSDHCI_MemoryMapped *sdhci, QTestState *qts, + uint32_t addr, QSDHCIProperties *common) +{ + sdhci->obj.get_driver = sdhci_mm_get_driver; + sdhci->sdhci.readw = sdhci_mm_readw; + sdhci->sdhci.readq = sdhci_mm_readq; + sdhci->sdhci.writeq = sdhci_mm_writeq; + memcpy(&sdhci->sdhci.props, common, sizeof(QSDHCIProperties)); + sdhci->addr = addr; + sdhci->qts = qts; +} + +/* PCI implementation of QSDHCI */ + +static uint16_t sdhci_pci_readw(QSDHCI *s, uint32_t reg) +{ + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); + return qpci_io_readw(&spci->dev, spci->mem_bar, reg); +} + +static uint64_t sdhci_pci_readq(QSDHCI *s, uint32_t reg) +{ + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); + return qpci_io_readq(&spci->dev, spci->mem_bar, reg); +} + +static void sdhci_pci_writeq(QSDHCI *s, uint32_t reg, uint64_t val) +{ + QSDHCI_PCI *spci = container_of(s, QSDHCI_PCI, sdhci); + return qpci_io_writeq(&spci->dev, spci->mem_bar, reg, val); +} + +static void *sdhci_pci_get_driver(void *object, const char *interface) +{ + QSDHCI_PCI *spci = object; + if (!g_strcmp0(interface, "sdhci")) { + return &spci->sdhci; + } + + fprintf(stderr, "%s not present in sdhci-pci\n", interface); + g_assert_not_reached(); +} + +static void sdhci_pci_start_hw(QOSGraphObject *obj) +{ + QSDHCI_PCI *spci = (QSDHCI_PCI *)obj; + qpci_device_enable(&spci->dev); +} + +static void sdhci_destructor(QOSGraphObject *obj) +{ + QSDHCI_PCI *spci = (QSDHCI_PCI *)obj; + qpci_iounmap(&spci->dev, spci->mem_bar); +} + +static void *sdhci_pci_create(void *pci_bus, QGuestAllocator *alloc, void *addr) +{ + QSDHCI_PCI *spci = g_new0(QSDHCI_PCI, 1); + QPCIBus *bus = pci_bus; + uint64_t barsize; + + qpci_device_init(&spci->dev, bus, addr); + spci->mem_bar = qpci_iomap(&spci->dev, 0, &barsize); + spci->sdhci.readw = sdhci_pci_readw; + spci->sdhci.readq = sdhci_pci_readq; + spci->sdhci.writeq = sdhci_pci_writeq; + set_qsdhci_fields(&spci->sdhci, 2, 0, 1, 0x057834b4); + + spci->obj.get_driver = sdhci_pci_get_driver; + spci->obj.start_hw = sdhci_pci_start_hw; + spci->obj.destructor = sdhci_destructor; + return &spci->obj; +} + +static void qsdhci_register_nodes(void) +{ + QPCIAddress addr = { + .devfn = QPCI_DEVFN(4, 0), + .vendor_id = PCI_VENDOR_ID_REDHAT, + .device_id = PCI_DEVICE_ID_REDHAT_SDHCI, + }; + + QOSGraphEdgeOptions opts = { + .extra_device_opts = "addr=04.0", + }; + + /* generic-sdhci */ + qos_node_create_driver("generic-sdhci", NULL); + qos_node_produces("generic-sdhci", "sdhci"); + + /* sdhci-pci */ + add_qpci_address(&opts, &addr); + qos_node_create_driver("sdhci-pci", sdhci_pci_create); + qos_node_produces("sdhci-pci", "sdhci"); + qos_node_consumes("sdhci-pci", "pci-bus", &opts); + +} + +libqos_init(qsdhci_register_nodes); diff --git a/tests/libqos/sdhci.h b/tests/libqos/sdhci.h new file mode 100644 index 0000000..e9880fc --- /dev/null +++ b/tests/libqos/sdhci.h @@ -0,0 +1,70 @@ +/* + * libqos driver framework + * + * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ + +#ifndef QGRAPH_QSDHCI +#define QGRAPH_QSDHCI + +#include "libqos/qgraph.h" +#include "pci.h" + +typedef struct QSDHCI QSDHCI; +typedef struct QSDHCI_MemoryMapped QSDHCI_MemoryMapped; +typedef struct QSDHCI_PCI QSDHCI_PCI; +typedef struct QSDHCIProperties QSDHCIProperties; + +/* Properties common to all QSDHCI devices */ +struct QSDHCIProperties { + uint8_t version; + uint8_t baseclock; + struct { + bool sdma; + uint64_t reg; + } capab; +}; + +struct QSDHCI { + uint16_t (*readw)(QSDHCI *s, uint32_t reg); + uint64_t (*readq)(QSDHCI *s, uint32_t reg); + void (*writeq)(QSDHCI *s, uint32_t reg, uint64_t val); + QSDHCIProperties props; +}; + +/* Memory Mapped implementation of QSDHCI */ +struct QSDHCI_MemoryMapped { + QOSGraphObject obj; + QTestState *qts; + QSDHCI sdhci; + uint64_t addr; +}; + +/* PCI implementation of QSDHCI */ +struct QSDHCI_PCI { + QOSGraphObject obj; + QPCIDevice dev; + QSDHCI sdhci; + QPCIBar mem_bar; +}; + +/** + * qos_init_sdhci_mm(): external constructor used by all drivers/machines + * that "contain" a #QSDHCI_MemoryMapped driver + */ +void qos_init_sdhci_mm(QSDHCI_MemoryMapped *sdhci, QTestState *qts, + uint32_t addr, QSDHCIProperties *common); + +#endif