hw/char: Move multi-serial devices into separate file
PATCH 1/1 hw/char: Move multi-serial devices into separate file
In our downstream distribution of QEMU, we'd like to ship the binary without the multi-serial PCI devices. To make this disablement easier, let's move the devices into a separate file and add a proper Kconfig- switch for these devices.
---
I've forgot to Cc: qemu-devel when I sent this yesterday, so sorry if you've got this mail twice.
hw/char/Kconfig | 6 ++ hw/char/Makefile.objs | 1 + hw/char/serial-pci-multi.c | 208 +++++++++++++++++++++++++++++++++++++++++++++ hw/char/serial-pci.c | 170 ------------------------------------ 4 files changed, 215 insertions(+), 170 deletions(-) create mode 100644 hw/char/serial-pci-multi.c
hw/char/Kconfig +6 -0
@@ -24,6 +24,12 @@ config SERIAL_PCI depends on PCI select SERIAL +config SERIAL_PCI_MULTI + bool + default y if PCI_DEVICES + depends on PCI + select SERIAL + config VIRTIO_SERIAL bool default y
hw/char/Makefile.objs +1 -0
@@ -7,6 +7,7 @@ common-obj-$(CONFIG_PL011) += pl011.o common-obj-$(CONFIG_SERIAL) += serial.o common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o +common-obj-$(CONFIG_SERIAL_PCI_MULTI) += serial-pci-multi.o common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN) += xen_console.o
hw/char/serial-pci-multi.c new file +208 -0
208 lines not on this page · raw message
hw/char/serial-pci.c +0 -170
221 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Hi
Quoted 7 lines · Thomas Huth
In our downstream distribution of QEMU, we'd like to ship the binary without the multi-serial PCI devices. To make this disablement easier, let's move the devices into a separate file and add a proper Kconfig- switch for these devices.
Signed-off-by Thomas Huth <[email protected]>
Quoted 488 lines
---
I've forgot to Cc: qemu-devel when I sent this yesterday, so sorry if you've got this mail twice.hw/char/Kconfig | 6 ++ hw/char/Makefile.objs | 1 + hw/char/serial-pci-multi.c | 208 +++++++++++++++++++++++++++++++++++++++++++++ hw/char/serial-pci.c | 170 ------------------------------------ 4 files changed, 215 insertions(+), 170 deletions(-) create mode 100644 hw/char/serial-pci-multi.chw/char/Kconfig +6
-0@@ -24,6 +24,12 @@ config SERIAL_PCI depends on PCI select SERIAL +config SERIAL_PCI_MULTI + bool + default y if PCI_DEVICES + depends on PCI + select SERIAL + config VIRTIO_SERIAL bool default yhw/char/Makefile.objs +1
-0@@ -7,6 +7,7 @@ common-obj-$(CONFIG_PL011) += pl011.o common-obj-$(CONFIG_SERIAL) += serial.o common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o +common-obj-$(CONFIG_SERIAL_PCI_MULTI) += serial-pci-multi.o common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN) += xen_console.ohw/char/serial-pci-multi.c new file +208
-0@@ -0,0 +1,208 @@ +/* +* QEMU 16550A multi UART emulation +* +* SPDX-License-Identifier: MIT +* +* Copyright (c) 2003-2004 Fabrice Bellard +* Copyright (c) 2008 Citrix Systems, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +/* see docs/specs/pci-serial.txt */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/char/serial.h" +#include "hw/pci/pci.h" + +#define PCI_SERIAL_MAX_PORTS 4 + +typedef struct PCIMultiSerialState { +PCIDevice dev; +MemoryRegion iobar; +uint32_t ports; +char *name[PCI_SERIAL_MAX_PORTS ]; +SerialState state[PCI_SERIAL_MAX_PORTS ]; +uint32_t level[PCI_SERIAL_MAX_PORTS ]; +qemu_irq *irqs; +uint8_t prog_if; +}PCIMultiSerialState ; + +static void multi_serial_pci_exit (PCIDevice *dev) +{ +PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); +SerialState *s; +int i; + +for (i =0 ; i < pci->ports; i++) { + s = pci->state + i; +serial_exit_core (s); +memory_region_del_subregion (&pci->iobar, &s->io); +g_free (pci->name[i]); + } +qemu_free_irqs (pci->irqs, pci->ports); +} + +static void multi_serial_irq_mux (void *opaque,int n,int level) +{ +PCIMultiSerialState *pci = opaque; +int i, pending =0 ; + + pci->level[n] = level; +for (i =0 ; i < pci->ports; i++) { +if (pci->level[i]) { + pending =1 ; + } + } +pci_set_irq (&pci->dev, pending); +} + +static void multi_serial_pci_realize (PCIDevice *dev,Error **errp) +{ +PCIDeviceClass *pc =PCI_DEVICE_GET_CLASS (dev); +PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); +SerialState *s; +Error *err =NULL ; +int i, nr_ports =0 ; + +switch (pc->device_id) { +case 0x0003 : + nr_ports =2 ; +break ; +case 0x0004 : + nr_ports =4 ; +break ; + } +assert (nr_ports >0 ); +assert (nr_ports <=PCI_SERIAL_MAX_PORTS ); + + pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; + pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; +memory_region_init (&pci->iobar,OBJECT (pci),"multiserial" ,8 * nr_ports); +pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &pci->iobar); + pci->irqs =qemu_allocate_irqs (multi_serial_irq_mux, pci, + nr_ports); + +for (i =0 ; i < nr_ports; i++) { + s = pci->state + i; + s->baudbase =115200 ; +serial_realize_core (s, &err); +if (err !=NULL ) { +error_propagate (errp, err); +multi_serial_pci_exit (dev); +return ; + } + s->irq = pci->irqs[i]; + pci->name[i] =g_strdup_printf ("uart #%d" , i +1 ); +memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, + pci->name[i],8 ); +memory_region_add_subregion (&pci->iobar,8 * i, &s->io); + pci->ports++; + } +} + +static const VMStateDescription vmstate_pci_multi_serial = { + .name ="pci-serial-multi" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_PCI_DEVICE (dev, PCIMultiSerialState), +VMSTATE_STRUCT_ARRAY (state, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS , +0 , vmstate_serial, SerialState), +VMSTATE_UINT32_ARRAY (level, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS ), +VMSTATE_END_OF_LIST () + } +}; + +static Property multi_2x_serial_pci_properties[] = { +DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), +DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), +DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static Property multi_4x_serial_pci_properties[] = { +DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), +DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), +DEFINE_PROP_CHR ("chardev3" , PCIMultiSerialState, state[2 ].chr), +DEFINE_PROP_CHR ("chardev4" , PCIMultiSerialState, state[3 ].chr), +DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void multi_2x_serial_pci_class_initfn (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); + pc->realize = multi_serial_pci_realize; + pc->exit = multi_serial_pci_exit; + pc->vendor_id =PCI_VENDOR_ID_REDHAT ; + pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL2 ; + pc->revision =1 ; + pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; + dc->vmsd = &vmstate_pci_multi_serial; + dc->props = multi_2x_serial_pci_properties; +set_bit (DEVICE_CATEGORY_INPUT , dc->categories); +} + +static void multi_4x_serial_pci_class_initfn (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); + pc->realize = multi_serial_pci_realize; + pc->exit = multi_serial_pci_exit; + pc->vendor_id =PCI_VENDOR_ID_REDHAT ; + pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL4 ; + pc->revision =1 ; + pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; + dc->vmsd = &vmstate_pci_multi_serial; + dc->props = multi_4x_serial_pci_properties; +set_bit (DEVICE_CATEGORY_INPUT , dc->categories); +} + +static const TypeInfo multi_2x_serial_pci_info = { + .name ="pci-serial-2x" , + .parent =TYPE_PCI_DEVICE , + .instance_size =sizeof (PCIMultiSerialState), + .class_init = multi_2x_serial_pci_class_initfn, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static const TypeInfo multi_4x_serial_pci_info = { + .name ="pci-serial-4x" , + .parent =TYPE_PCI_DEVICE , + .instance_size =sizeof (PCIMultiSerialState), + .class_init = multi_4x_serial_pci_class_initfn, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void multi_serial_pci_register_types (void ) +{ +type_register_static (&multi_2x_serial_pci_info); +type_register_static (&multi_4x_serial_pci_info); +} + +type_init (multi_serial_pci_register_types)hw/char/serial-pci.c +0
-171@@ -30,26 +30,12 @@#include "hw/char/serial.h" #include "hw/pci/pci.h" -#define PCI_SERIAL_MAX_PORTS 4 -typedef struct PCISerialState {PCIDevice dev;SerialState state;uint8_t prog_if; }PCISerialState ; -typedef struct PCIMultiSerialState { -PCIDevice dev; -MemoryRegion iobar; -uint32_t ports; -char *name[PCI_SERIAL_MAX_PORTS ]; -SerialState state[PCI_SERIAL_MAX_PORTS ]; -uint32_t level[PCI_SERIAL_MAX_PORTS ]; -qemu_irq *irqs; -uint8_t prog_if; -}PCIMultiSerialState ; - -static void multi_serial_pci_exit (PCIDevice *dev);static void serial_pci_realize (PCIDevice *dev,Error **errp) {@@ -72,64 +58,6 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io); } -static void multi_serial_irq_mux (void *opaque,int n,int level) -{ -PCIMultiSerialState *pci = opaque; -int i, pending =0 ; - - pci->level[n] = level; -for (i =0 ; i < pci->ports; i++) { -if (pci->level[i]) { - pending =1 ; - } - } -pci_set_irq (&pci->dev, pending); -} - -static void multi_serial_pci_realize (PCIDevice *dev,Error **errp) -{ -PCIDeviceClass *pc =PCI_DEVICE_GET_CLASS (dev); -PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); -SerialState *s; -Error *err =NULL ; -int i, nr_ports =0 ; - -switch (pc->device_id) { -case 0x0003 : - nr_ports =2 ; -break ; -case 0x0004 : - nr_ports =4 ; -break ; - } -assert (nr_ports >0 ); -assert (nr_ports <=PCI_SERIAL_MAX_PORTS ); - - pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; - pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; -memory_region_init (&pci->iobar,OBJECT (pci),"multiserial" ,8 * nr_ports); -pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &pci->iobar); - pci->irqs =qemu_allocate_irqs (multi_serial_irq_mux, pci, - nr_ports); - -for (i =0 ; i < nr_ports; i++) { - s = pci->state + i; - s->baudbase =115200 ; -serial_realize_core (s, &err); -if (err !=NULL ) { -error_propagate (errp, err); -multi_serial_pci_exit (dev); -return ; - } - s->irq = pci->irqs[i]; - pci->name[i] =g_strdup_printf ("uart #%d" , i+1 ); -memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, - pci->name[i],8 ); -memory_region_add_subregion (&pci->iobar,8 * i, &s->io); - pci->ports++; - } -} -static void serial_pci_exit (PCIDevice *dev) {PCISerialState *pci =DO_UPCAST (PCISerialState, dev, dev);@@ -139,21 +67,6 @@ static void serial_pci_exit(PCIDevice *dev)qemu_free_irq (s->irq); } -static void multi_serial_pci_exit (PCIDevice *dev) -{ -PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); -SerialState *s; -int i; - -for (i =0 ; i < pci->ports; i++) { - s = pci->state + i; -serial_exit_core (s); -memory_region_del_subregion (&pci->iobar, &s->io); -g_free (pci->name[i]); - } -qemu_free_irqs (pci->irqs, pci->ports); -} -static const VMStateDescription vmstate_pci_serial = { .name ="pci-serial" , .version_id =1 ,@@ -165,41 +78,12 @@ static const VMStateDescription vmstate_pci_serial = { } }; -static const VMStateDescription vmstate_pci_multi_serial = { - .name ="pci-serial-multi" , - .version_id =1 , - .minimum_version_id =1 , - .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, PCIMultiSerialState), -VMSTATE_STRUCT_ARRAY (state, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS , -0 , vmstate_serial, SerialState), -VMSTATE_UINT32_ARRAY (level, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS ), -VMSTATE_END_OF_LIST () - } -}; -static Property serial_pci_properties[] = {DEFINE_PROP_CHR ("chardev" , PCISerialState, state.chr),DEFINE_PROP_UINT8 ("prog_if" , PCISerialState, prog_if,0x02 ),DEFINE_PROP_END_OF_LIST (), }; -static Property multi_2x_serial_pci_properties[] = { -DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), -DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), -DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), -DEFINE_PROP_END_OF_LIST (), -}; - -static Property multi_4x_serial_pci_properties[] = { -DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), -DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), -DEFINE_PROP_CHR ("chardev3" , PCIMultiSerialState, state[2 ].chr), -DEFINE_PROP_CHR ("chardev4" , PCIMultiSerialState, state[3 ].chr), -DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), -DEFINE_PROP_END_OF_LIST (), -}; -static void serial_pci_class_initfn (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);@@ -215,36 +99,6 @@ static void serial_pci_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_INPUT , dc->categories); } -static void multi_2x_serial_pci_class_initfn (ObjectClass *klass,void *data) -{ -DeviceClass *dc =DEVICE_CLASS (klass); -PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); - pc->realize = multi_serial_pci_realize; - pc->exit = multi_serial_pci_exit; - pc->vendor_id =PCI_VENDOR_ID_REDHAT ; - pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL2 ; - pc->revision =1 ; - pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; - dc->vmsd = &vmstate_pci_multi_serial; - dc->props = multi_2x_serial_pci_properties; -set_bit (DEVICE_CATEGORY_INPUT , dc->categories); -} - -static void multi_4x_serial_pci_class_initfn (ObjectClass *klass,void *data) -{ -DeviceClass *dc =DEVICE_CLASS (klass); -PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); - pc->realize = multi_serial_pci_realize; - pc->exit = multi_serial_pci_exit; - pc->vendor_id =PCI_VENDOR_ID_REDHAT ; - pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL4 ; - pc->revision =1 ; - pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; - dc->vmsd = &vmstate_pci_multi_serial; - dc->props = multi_4x_serial_pci_properties; -set_bit (DEVICE_CATEGORY_INPUT , dc->categories); -} -static const TypeInfo serial_pci_info = { .name ="pci-serial" , .parent =TYPE_PCI_DEVICE ,@@ -256,33 +110,9 @@ static const TypeInfo serial_pci_info = { }, }; -static const TypeInfo multi_2x_serial_pci_info = { - .name ="pci-serial-2x" , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PCIMultiSerialState), - .class_init = multi_2x_serial_pci_class_initfn, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - -static const TypeInfo multi_4x_serial_pci_info = { - .name ="pci-serial-4x" , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PCIMultiSerialState), - .class_init = multi_4x_serial_pci_class_initfn, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; -static void serial_pci_register_types (void ) {type_register_static (&serial_pci_info); -type_register_static (&multi_2x_serial_pci_info); -type_register_static (&multi_4x_serial_pci_info); }type_init (serial_pci_register_types) --1.8.3.1
Quoted 6 lines · Thomas Huth
In our downstream distribution of QEMU, we'd like to ship the binary without the multi-serial PCI devices. To make this disablement easier, let's move the devices into a separate file and add a proper Kconfig- switch for these devices.
Signed-off-by Thomas Huth <[email protected]>
Quoted 486 lines
---
I've forgot to Cc: qemu-devel when I sent this yesterday, so sorry if you've got this mail twice.hw/char/Kconfig | 6 ++ hw/char/Makefile.objs | 1 + hw/char/serial-pci-multi.c | 208 +++++++++++++++++++++++++++++++++++++++++++++ hw/char/serial-pci.c | 170 ------------------------------------ 4 files changed, 215 insertions(+), 170 deletions(-) create mode 100644 hw/char/serial-pci-multi.chw/char/Kconfig +6
-0@@ -24,6 +24,12 @@ config SERIAL_PCI depends on PCI select SERIAL +config SERIAL_PCI_MULTI + bool + default y if PCI_DEVICES + depends on PCI + select SERIAL + config VIRTIO_SERIAL bool default yhw/char/Makefile.objs +1
-0@@ -7,6 +7,7 @@ common-obj-$(CONFIG_PL011) += pl011.o common-obj-$(CONFIG_SERIAL) += serial.o common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o +common-obj-$(CONFIG_SERIAL_PCI_MULTI) += serial-pci-multi.o common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o common-obj-$(CONFIG_XEN) += xen_console.ohw/char/serial-pci-multi.c new file +208
-0@@ -0,0 +1,208 @@ +/* +* QEMU 16550A multi UART emulation +* +* SPDX-License-Identifier: MIT +* +* Copyright (c) 2003-2004 Fabrice Bellard +* Copyright (c) 2008 Citrix Systems, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +/* see docs/specs/pci-serial.txt */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/char/serial.h" +#include "hw/pci/pci.h" + +#define PCI_SERIAL_MAX_PORTS 4 + +typedef struct PCIMultiSerialState { +PCIDevice dev; +MemoryRegion iobar; +uint32_t ports; +char *name[PCI_SERIAL_MAX_PORTS ]; +SerialState state[PCI_SERIAL_MAX_PORTS ]; +uint32_t level[PCI_SERIAL_MAX_PORTS ]; +qemu_irq *irqs; +uint8_t prog_if; +}PCIMultiSerialState ; + +static void multi_serial_pci_exit (PCIDevice *dev) +{ +PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); +SerialState *s; +int i; + +for (i =0 ; i < pci->ports; i++) { + s = pci->state + i; +serial_exit_core (s); +memory_region_del_subregion (&pci->iobar, &s->io); +g_free (pci->name[i]); + } +qemu_free_irqs (pci->irqs, pci->ports); +} + +static void multi_serial_irq_mux (void *opaque,int n,int level) +{ +PCIMultiSerialState *pci = opaque; +int i, pending =0 ; + + pci->level[n] = level; +for (i =0 ; i < pci->ports; i++) { +if (pci->level[i]) { + pending =1 ; + } + } +pci_set_irq (&pci->dev, pending); +} + +static void multi_serial_pci_realize (PCIDevice *dev,Error **errp) +{ +PCIDeviceClass *pc =PCI_DEVICE_GET_CLASS (dev); +PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); +SerialState *s; +Error *err =NULL ; +int i, nr_ports =0 ; + +switch (pc->device_id) { +case 0x0003 : + nr_ports =2 ; +break ; +case 0x0004 : + nr_ports =4 ; +break ; + } +assert (nr_ports >0 ); +assert (nr_ports <=PCI_SERIAL_MAX_PORTS ); + + pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; + pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; +memory_region_init (&pci->iobar,OBJECT (pci),"multiserial" ,8 * nr_ports); +pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &pci->iobar); + pci->irqs =qemu_allocate_irqs (multi_serial_irq_mux, pci, + nr_ports); + +for (i =0 ; i < nr_ports; i++) { + s = pci->state + i; + s->baudbase =115200 ; +serial_realize_core (s, &err); +if (err !=NULL ) { +error_propagate (errp, err); +multi_serial_pci_exit (dev); +return ; + } + s->irq = pci->irqs[i]; + pci->name[i] =g_strdup_printf ("uart #%d" , i +1 ); +memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, + pci->name[i],8 ); +memory_region_add_subregion (&pci->iobar,8 * i, &s->io); + pci->ports++; + } +} + +static const VMStateDescription vmstate_pci_multi_serial = { + .name ="pci-serial-multi" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_PCI_DEVICE (dev, PCIMultiSerialState), +VMSTATE_STRUCT_ARRAY (state, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS , +0 , vmstate_serial, SerialState), +VMSTATE_UINT32_ARRAY (level, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS ), +VMSTATE_END_OF_LIST () + } +}; + +static Property multi_2x_serial_pci_properties[] = { +DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), +DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), +DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static Property multi_4x_serial_pci_properties[] = { +DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), +DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), +DEFINE_PROP_CHR ("chardev3" , PCIMultiSerialState, state[2 ].chr), +DEFINE_PROP_CHR ("chardev4" , PCIMultiSerialState, state[3 ].chr), +DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void multi_2x_serial_pci_class_initfn (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); + pc->realize = multi_serial_pci_realize; + pc->exit = multi_serial_pci_exit; + pc->vendor_id =PCI_VENDOR_ID_REDHAT ; + pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL2 ; + pc->revision =1 ; + pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; + dc->vmsd = &vmstate_pci_multi_serial; + dc->props = multi_2x_serial_pci_properties; +set_bit (DEVICE_CATEGORY_INPUT , dc->categories); +} + +static void multi_4x_serial_pci_class_initfn (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); + pc->realize = multi_serial_pci_realize; + pc->exit = multi_serial_pci_exit; + pc->vendor_id =PCI_VENDOR_ID_REDHAT ; + pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL4 ; + pc->revision =1 ; + pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; + dc->vmsd = &vmstate_pci_multi_serial; + dc->props = multi_4x_serial_pci_properties; +set_bit (DEVICE_CATEGORY_INPUT , dc->categories); +} + +static const TypeInfo multi_2x_serial_pci_info = { + .name ="pci-serial-2x" , + .parent =TYPE_PCI_DEVICE , + .instance_size =sizeof (PCIMultiSerialState), + .class_init = multi_2x_serial_pci_class_initfn, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static const TypeInfo multi_4x_serial_pci_info = { + .name ="pci-serial-4x" , + .parent =TYPE_PCI_DEVICE , + .instance_size =sizeof (PCIMultiSerialState), + .class_init = multi_4x_serial_pci_class_initfn, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void multi_serial_pci_register_types (void ) +{ +type_register_static (&multi_2x_serial_pci_info); +type_register_static (&multi_4x_serial_pci_info); +} + +type_init (multi_serial_pci_register_types)hw/char/serial-pci.c +0
-170@@ -30,26 +30,12 @@#include "hw/char/serial.h" #include "hw/pci/pci.h" -#define PCI_SERIAL_MAX_PORTS 4 -typedef struct PCISerialState {PCIDevice dev;SerialState state;uint8_t prog_if; }PCISerialState ; -typedef struct PCIMultiSerialState { -PCIDevice dev; -MemoryRegion iobar; -uint32_t ports; -char *name[PCI_SERIAL_MAX_PORTS ]; -SerialState state[PCI_SERIAL_MAX_PORTS ]; -uint32_t level[PCI_SERIAL_MAX_PORTS ]; -qemu_irq *irqs; -uint8_t prog_if; -}PCIMultiSerialState ; - -static void multi_serial_pci_exit (PCIDevice *dev);static void serial_pci_realize (PCIDevice *dev,Error **errp) {@@ -72,64 +58,6 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io); } -static void multi_serial_irq_mux (void *opaque,int n,int level) -{ -PCIMultiSerialState *pci = opaque; -int i, pending =0 ; - - pci->level[n] = level; -for (i =0 ; i < pci->ports; i++) { -if (pci->level[i]) { - pending =1 ; - } - } -pci_set_irq (&pci->dev, pending); -} - -static void multi_serial_pci_realize (PCIDevice *dev,Error **errp) -{ -PCIDeviceClass *pc =PCI_DEVICE_GET_CLASS (dev); -PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); -SerialState *s; -Error *err =NULL ; -int i, nr_ports =0 ; - -switch (pc->device_id) { -case 0x0003 : - nr_ports =2 ; -break ; -case 0x0004 : - nr_ports =4 ; -break ; - } -assert (nr_ports >0 ); -assert (nr_ports <=PCI_SERIAL_MAX_PORTS ); - - pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; - pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; -memory_region_init (&pci->iobar,OBJECT (pci),"multiserial" ,8 * nr_ports); -pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &pci->iobar); - pci->irqs =qemu_allocate_irqs (multi_serial_irq_mux, pci, - nr_ports); - -for (i =0 ; i < nr_ports; i++) { - s = pci->state + i; - s->baudbase =115200 ; -serial_realize_core (s, &err); -if (err !=NULL ) { -error_propagate (errp, err); -multi_serial_pci_exit (dev); -return ; - } - s->irq = pci->irqs[i]; - pci->name[i] =g_strdup_printf ("uart #%d" , i+1 ); -memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, - pci->name[i],8 ); -memory_region_add_subregion (&pci->iobar,8 * i, &s->io); - pci->ports++; - } -} -static void serial_pci_exit (PCIDevice *dev) {PCISerialState *pci =DO_UPCAST (PCISerialState, dev, dev);@@ -139,21 +67,6 @@ static void serial_pci_exit(PCIDevice *dev)qemu_free_irq (s->irq); } -static void multi_serial_pci_exit (PCIDevice *dev) -{ -PCIMultiSerialState *pci =DO_UPCAST (PCIMultiSerialState, dev, dev); -SerialState *s; -int i; - -for (i =0 ; i < pci->ports; i++) { - s = pci->state + i; -serial_exit_core (s); -memory_region_del_subregion (&pci->iobar, &s->io); -g_free (pci->name[i]); - } -qemu_free_irqs (pci->irqs, pci->ports); -} -static const VMStateDescription vmstate_pci_serial = { .name ="pci-serial" , .version_id =1 ,@@ -165,41 +78,12 @@ static const VMStateDescription vmstate_pci_serial = { } }; -static const VMStateDescription vmstate_pci_multi_serial = { - .name ="pci-serial-multi" , - .version_id =1 , - .minimum_version_id =1 , - .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, PCIMultiSerialState), -VMSTATE_STRUCT_ARRAY (state, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS , -0 , vmstate_serial, SerialState), -VMSTATE_UINT32_ARRAY (level, PCIMultiSerialState,PCI_SERIAL_MAX_PORTS ), -VMSTATE_END_OF_LIST () - } -}; -static Property serial_pci_properties[] = {DEFINE_PROP_CHR ("chardev" , PCISerialState, state.chr),DEFINE_PROP_UINT8 ("prog_if" , PCISerialState, prog_if,0x02 ),DEFINE_PROP_END_OF_LIST (), }; -static Property multi_2x_serial_pci_properties[] = { -DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), -DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), -DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), -DEFINE_PROP_END_OF_LIST (), -}; - -static Property multi_4x_serial_pci_properties[] = { -DEFINE_PROP_CHR ("chardev1" , PCIMultiSerialState, state[0 ].chr), -DEFINE_PROP_CHR ("chardev2" , PCIMultiSerialState, state[1 ].chr), -DEFINE_PROP_CHR ("chardev3" , PCIMultiSerialState, state[2 ].chr), -DEFINE_PROP_CHR ("chardev4" , PCIMultiSerialState, state[3 ].chr), -DEFINE_PROP_UINT8 ("prog_if" , PCIMultiSerialState, prog_if,0x02 ), -DEFINE_PROP_END_OF_LIST (), -}; -static void serial_pci_class_initfn (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);@@ -215,36 +99,6 @@ static void serial_pci_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_INPUT , dc->categories); } -static void multi_2x_serial_pci_class_initfn (ObjectClass *klass,void *data) -{ -DeviceClass *dc =DEVICE_CLASS (klass); -PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); - pc->realize = multi_serial_pci_realize; - pc->exit = multi_serial_pci_exit; - pc->vendor_id =PCI_VENDOR_ID_REDHAT ; - pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL2 ; - pc->revision =1 ; - pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; - dc->vmsd = &vmstate_pci_multi_serial; - dc->props = multi_2x_serial_pci_properties; -set_bit (DEVICE_CATEGORY_INPUT , dc->categories); -} - -static void multi_4x_serial_pci_class_initfn (ObjectClass *klass,void *data) -{ -DeviceClass *dc =DEVICE_CLASS (klass); -PCIDeviceClass *pc =PCI_DEVICE_CLASS (klass); - pc->realize = multi_serial_pci_realize; - pc->exit = multi_serial_pci_exit; - pc->vendor_id =PCI_VENDOR_ID_REDHAT ; - pc->device_id =PCI_DEVICE_ID_REDHAT_SERIAL4 ; - pc->revision =1 ; - pc->class_id =PCI_CLASS_COMMUNICATION_SERIAL ; - dc->vmsd = &vmstate_pci_multi_serial; - dc->props = multi_4x_serial_pci_properties; -set_bit (DEVICE_CATEGORY_INPUT , dc->categories); -} -static const TypeInfo serial_pci_info = { .name ="pci-serial" , .parent =TYPE_PCI_DEVICE ,@@ -256,33 +110,9 @@ static const TypeInfo serial_pci_info = { }, }; -static const TypeInfo multi_2x_serial_pci_info = { - .name ="pci-serial-2x" , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PCIMultiSerialState), - .class_init = multi_2x_serial_pci_class_initfn, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - -static const TypeInfo multi_4x_serial_pci_info = { - .name ="pci-serial-4x" , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PCIMultiSerialState), - .class_init = multi_4x_serial_pci_class_initfn, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; -static void serial_pci_register_types (void ) {type_register_static (&serial_pci_info); -type_register_static (&multi_2x_serial_pci_info); -type_register_static (&multi_4x_serial_pci_info); }type_init (serial_pci_register_types)