* [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out
@ 2015-07-02 5:53 David Gibson
2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO David Gibson
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: David Gibson @ 2015-07-02 5:53 UTC (permalink / raw)
To: agraf, peter.maydell, armbru, lcapitulino
Cc: lvivier, thuth, mst, qemu-devel, qemu-ppc, peter.crosthwaite,
afaerber, David Gibson
At the moment isa-bus.c is compiled unconditionally for all targets.
However, some targets have never used legacy ISA devices. Many more
targets have at least some machine types without ISA.
These patches allow ISA bus to be disabled in the configuration, thus
allowing cut down configurations for targets and machine types that
don't have ISA.
Actually turning off ISA will require more than this for most targets
- there are a number of non-obvious dependencies on the ISA code.
b19c1c0 "isa: remove isa_mem_base variable" already got rid of an
important one (VGA depended on ISA). Patches 2/4 and 4/4 in this
series remove some more. There are a number more though, for example
CONFIG_IDE_CORE depends on ISA and the HMP "info irq" command depends
on I8259 code.
This patch should allow easier experimentation so we can chip away at
those dependencies on legacy code in the future.
Changes in v2:
* Removed changes to HMP, since it would cause a regression for PReP
* Added a cleanup of the dead CONFIG_ISA_MMIO variable
* Clearer explanation of the situation in commit messages
David Gibson (4):
Cleanup leftover CONFIG_ISA_MMIO
Split serial-isa into its own config option
Allow ISA bus to be configured out
Split ISA and sysbus versions of m48t59 device
default-configs/alpha-softmmu.mak | 1 +
default-configs/arm-softmmu.mak | 2 +-
default-configs/i386-softmmu.mak | 1 +
default-configs/mips-softmmu.mak | 1 +
default-configs/mips64-softmmu.mak | 1 +
default-configs/mips64el-softmmu.mak | 1 +
default-configs/mipsel-softmmu.mak | 1 +
default-configs/moxie-softmmu.mak | 1 +
default-configs/pci.mak | 1 +
default-configs/ppc-softmmu.mak | 2 +-
default-configs/ppc64-softmmu.mak | 2 +-
default-configs/ppcemb-softmmu.mak | 1 +
default-configs/sh4-softmmu.mak | 1 +
default-configs/sh4eb-softmmu.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
default-configs/sparc64-softmmu.mak | 2 +-
default-configs/unicore32-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/char/Makefile.objs | 3 +-
hw/isa/Makefile.objs | 2 +-
hw/timer/Makefile.objs | 3 +
hw/timer/m48t59-internal.h | 82 ++++++++++++
hw/timer/m48t59-isa.c | 180 +++++++++++++++++++++++++++
hw/timer/m48t59.c | 228 +++-------------------------------
24 files changed, 304 insertions(+), 216 deletions(-)
create mode 100644 hw/timer/m48t59-internal.h
create mode 100644 hw/timer/m48t59-isa.c
--
2.4.3
^ permalink raw reply [flat|nested] 11+ messages in thread* [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson @ 2015-07-02 5:53 ` David Gibson 2015-07-02 8:06 ` Peter Maydell 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 2/4] Split serial-isa into its own config option David Gibson ` (4 subsequent siblings) 5 siblings, 1 reply; 11+ messages in thread From: David Gibson @ 2015-07-02 5:53 UTC (permalink / raw) To: agraf, peter.maydell, armbru, lcapitulino Cc: lvivier, thuth, mst, qemu-devel, qemu-ppc, peter.crosthwaite, afaerber, David Gibson Commit 61fcb62 "isa_mmio: delete" removed the CONFIG_ISA_MMIO switch and the isa_mmio code controlled by it. However, a few of the default-configs still set the variable, pointlessly. This cleans these up. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- default-configs/arm-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - 4 files changed, 4 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 74f1db3..03af787 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,7 +3,6 @@ include pci.mak include usb.mak CONFIG_VGA=y -CONFIG_ISA_MMIO=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 4befde3..d4d0f9b 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,7 +3,6 @@ include pci.mak include sound.mak include usb.mak -CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_SERIAL=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index ab62cc7..f641848 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -3,7 +3,6 @@ include pci.mak include sound.mak include usb.mak -CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_SERIAL=y diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index 123bb99..c0cdd64 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -2,7 +2,6 @@ include pci.mak include usb.mak -CONFIG_ISA_MMIO=y CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_SERIAL=y -- 2.4.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO David Gibson @ 2015-07-02 8:06 ` Peter Maydell 0 siblings, 0 replies; 11+ messages in thread From: Peter Maydell @ 2015-07-02 8:06 UTC (permalink / raw) To: David Gibson Cc: Laurent Vivier, Thomas Huth, Michael S. Tsirkin, QEMU Developers, Markus Armbruster, Alexander Graf, Luiz Capitulino, qemu-ppc@nongnu.org, Peter Crosthwaite, Andreas Färber On 2 July 2015 at 06:53, David Gibson <david@gibson.dropbear.id.au> wrote: > Commit 61fcb62 "isa_mmio: delete" removed the CONFIG_ISA_MMIO switch and > the isa_mmio code controlled by it. However, a few of the default-configs > still set the variable, pointlessly. This cleans these up. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > default-configs/arm-softmmu.mak | 1 - > default-configs/ppc-softmmu.mak | 1 - > default-configs/ppc64-softmmu.mak | 1 - > default-configs/sparc64-softmmu.mak | 1 - > 4 files changed, 4 deletions(-) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCHv2 2/4] Split serial-isa into its own config option 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO David Gibson @ 2015-07-02 5:53 ` David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out David Gibson ` (3 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: David Gibson @ 2015-07-02 5:53 UTC (permalink / raw) To: agraf, peter.maydell, armbru, lcapitulino Cc: lvivier, thuth, mst, qemu-devel, qemu-ppc, peter.crosthwaite, afaerber, David Gibson At present, the core device model code for 8250-like serial ports (serial.c) and the code for serial ports attached to ISA-style legacy IO (serial-isa.c) are both controlled by the CONFIG_SERIAL variable. There are lots and lots of embedded platforms that have 8250-like serial ports but have never had anything resembling ISA legacy IO. Therefore, split serial-isa into its own CONFIG_SERIAL_ISA option so it can be disabled for platforms where it's not appropriate. For now, I enabled CONFIG_SERIAL_ISA in every default-config where CONFIG_SERIAL is enabled, excepting microblaze, moxie, or32, and xtensa. As best as I can tell, those platforms never used legacy ISA, and also don't include PCI support (which would allow connection of a PCI->ISA bridge and/or a southbridge including legacy ISA serial ports). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- default-configs/alpha-softmmu.mak | 1 + default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/char/Makefile.objs | 3 ++- 15 files changed, 16 insertions(+), 1 deletion(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 7f6161e..e0d75e3 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include usb.mak CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_I8254=y CONFIG_PCKBD=y CONFIG_VGA_CIRRUS=y diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 03af787..9a90a52 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PTIMER=y CONFIG_SD=y CONFIG_MAX7310=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 91d602c..bc2fc72 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_VMMOUSE=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 44467c3..cccf41b 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 66ed5f9..6fab828 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index bfca2b2..2facfc6 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 0162ef0..8331100 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index d4d0f9b..13eb94f 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -45,5 +45,6 @@ CONFIG_PLATFORM_BUS=y CONFIG_ETSEC=y CONFIG_LIBDECNUMBER=y # For PReP +CONFIG_SERIAL_ISA=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index f641848..792af0f 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -49,5 +49,6 @@ CONFIG_LIBDECNUMBER=y CONFIG_XICS=$(CONFIG_PSERIES) CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM)) # For PReP +CONFIG_SERIAL_ISA=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 54acc4d..7f56004 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -5,6 +5,7 @@ include sound.mak include usb.mak CONFIG_M48T59=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_I8257=y CONFIG_OPENPIC=y CONFIG_PFLASH_CFI01=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 8e00390..546d855 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include usb.mak CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_SH4=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index efdd058..2d3fd49 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include usb.mak CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_SH4=y diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index c0cdd64..922db55 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -5,6 +5,7 @@ include usb.mak CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_PCKBD=y CONFIG_FDC=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 62575eb..a9a7238 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_VMWARE_VGA=y CONFIG_VIRTIO_VGA=y CONFIG_VMMOUSE=y CONFIG_SERIAL=y +CONFIG_SERIAL_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index 5931cc8..be42d2f 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -2,7 +2,8 @@ common-obj-$(CONFIG_IPACK) += ipoctal232.o common-obj-$(CONFIG_ESCC) += escc.o common-obj-$(CONFIG_PARALLEL) += parallel.o common-obj-$(CONFIG_PL011) += pl011.o -common-obj-$(CONFIG_SERIAL) += serial.o serial-isa.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_VIRTIO) += virtio-console.o common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o -- 2.4.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 2/4] Split serial-isa into its own config option David Gibson @ 2015-07-02 5:53 ` David Gibson 2015-07-02 8:45 ` Michael S. Tsirkin 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 4/4] Split ISA and sysbus versions of m48t59 device David Gibson ` (2 subsequent siblings) 5 siblings, 1 reply; 11+ messages in thread From: David Gibson @ 2015-07-02 5:53 UTC (permalink / raw) To: agraf, peter.maydell, armbru, lcapitulino Cc: lvivier, thuth, mst, qemu-devel, qemu-ppc, peter.crosthwaite, afaerber, David Gibson Currently, the code to handle the legacy ISA bus is always included in qemu. However there are lots of platforms that don't include ISA legacy devies, and quite a few that have never used ISA legacy devices at all. This patch allows the ISA bus code to be disabled in the configuration for platforms where it doesn't make sense. For now, the default configs are adjusted to include ISA on all platforms including PCI: anything with PCI can at least in principle add an i82378 PCI->ISA bridge. Also, CONFIG_IDE_CORE which is already in pci.mak requires ISA support. We also explicitly enable ISA on some other non-PCI platforms which include ISA devices. We may want to pare this down in future. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- default-configs/moxie-softmmu.mak | 1 + default-configs/pci.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/unicore32-softmmu.mak | 1 + hw/isa/Makefile.objs | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak index 1a95476..3886275 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for moxie-softmmu +CONFIG_ISA_BUS=y CONFIG_MC146818RTC=y CONFIG_SERIAL=y CONFIG_VGA=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 7e10903..9f2b98c 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -1,4 +1,5 @@ CONFIG_PCI=y +CONFIG_ISA_BUS=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO=y CONFIG_USB_UHCI=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index ab796b3..004b0f4 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for sparc-softmmu +CONFIG_ISA_BUS=y CONFIG_ECC=y CONFIG_ESP=y CONFIG_ESCC=y diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicore32-softmmu.mak index de38577..5f6c4a8 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,4 +1,5 @@ # Default configuration for unicore32-softmmu +CONFIG_ISA_BUS=y CONFIG_PUV3=y CONFIG_PTIMER=y CONFIG_PCKBD=y diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index 9164556..fb37c55 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += isa-bus.o +common-obj-$(CONFIG_ISA_BUS) += isa-bus.o common-obj-$(CONFIG_APM) += apm.o common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_PC87312) += pc87312.o -- 2.4.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out David Gibson @ 2015-07-02 8:45 ` Michael S. Tsirkin 0 siblings, 0 replies; 11+ messages in thread From: Michael S. Tsirkin @ 2015-07-02 8:45 UTC (permalink / raw) To: David Gibson Cc: lvivier, peter.maydell, thuth, qemu-devel, armbru, agraf, lcapitulino, qemu-ppc, peter.crosthwaite, afaerber On Thu, Jul 02, 2015 at 03:53:46PM +1000, David Gibson wrote: > Currently, the code to handle the legacy ISA bus is always included in > qemu. However there are lots of platforms that don't include ISA legacy > devies, and quite a few that have never used ISA legacy devices at all. > > This patch allows the ISA bus code to be disabled in the configuration for > platforms where it doesn't make sense. > > For now, the default configs are adjusted to include ISA on all platforms > including PCI: anything with PCI can at least in principle add an i82378 > PCI->ISA bridge. That would be a config bug, won't it? Don't enable CONFIG_I82378 unless you want ISA. > Also, CONFIG_IDE_CORE which is already in pci.mak > requires ISA support. Ugh that's ugly. We really need to express dependencies between config options, long term. Until we support this, how about a comment to document why is ISA pulled in by pci.mak? > > We also explicitly enable ISA on some other non-PCI platforms which include > ISA devices. We may want to pare this down in future. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Only a comment requested so Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > default-configs/moxie-softmmu.mak | 1 + > default-configs/pci.mak | 1 + > default-configs/sparc-softmmu.mak | 1 + > default-configs/unicore32-softmmu.mak | 1 + > hw/isa/Makefile.objs | 2 +- > 5 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak > index 1a95476..3886275 100644 > --- a/default-configs/moxie-softmmu.mak > +++ b/default-configs/moxie-softmmu.mak > @@ -1,5 +1,6 @@ > # Default configuration for moxie-softmmu > > +CONFIG_ISA_BUS=y > CONFIG_MC146818RTC=y > CONFIG_SERIAL=y > CONFIG_VGA=y > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > index 7e10903..9f2b98c 100644 > --- a/default-configs/pci.mak > +++ b/default-configs/pci.mak > @@ -1,4 +1,5 @@ > CONFIG_PCI=y > +CONFIG_ISA_BUS=y > CONFIG_VIRTIO_PCI=y > CONFIG_VIRTIO=y > CONFIG_USB_UHCI=y > diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak > index ab796b3..004b0f4 100644 > --- a/default-configs/sparc-softmmu.mak > +++ b/default-configs/sparc-softmmu.mak > @@ -1,5 +1,6 @@ > # Default configuration for sparc-softmmu > > +CONFIG_ISA_BUS=y > CONFIG_ECC=y > CONFIG_ESP=y > CONFIG_ESCC=y > diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicore32-softmmu.mak > index de38577..5f6c4a8 100644 > --- a/default-configs/unicore32-softmmu.mak > +++ b/default-configs/unicore32-softmmu.mak > @@ -1,4 +1,5 @@ > # Default configuration for unicore32-softmmu > +CONFIG_ISA_BUS=y > CONFIG_PUV3=y > CONFIG_PTIMER=y > CONFIG_PCKBD=y > diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs > index 9164556..fb37c55 100644 > --- a/hw/isa/Makefile.objs > +++ b/hw/isa/Makefile.objs > @@ -1,4 +1,4 @@ > -common-obj-y += isa-bus.o > +common-obj-$(CONFIG_ISA_BUS) += isa-bus.o > common-obj-$(CONFIG_APM) += apm.o > common-obj-$(CONFIG_I82378) += i82378.o > common-obj-$(CONFIG_PC87312) += pc87312.o > -- > 2.4.3 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCHv2 4/4] Split ISA and sysbus versions of m48t59 device 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson ` (2 preceding siblings ...) 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out David Gibson @ 2015-07-02 5:53 ` David Gibson 2015-07-02 6:19 ` [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out Michael S. Tsirkin 2015-07-04 23:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt 5 siblings, 0 replies; 11+ messages in thread From: David Gibson @ 2015-07-02 5:53 UTC (permalink / raw) To: agraf, peter.maydell, armbru, lcapitulino Cc: lvivier, thuth, mst, qemu-devel, qemu-ppc, peter.crosthwaite, afaerber, David Gibson The m48t59 device supports both ISA and direct sysbus attached versions of the device in the one .c file. This can be awkward for some embedded machine types which need the sysbus M48T59, but don't want to pull in the ISA bus code and its other dependencies. Therefore, this patch splits out the code for the ISA attached M48T59 into its own C file. It will be built when both CONFIG_M48T59 and CONFIG_ISA_BUS are enabled. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/timer/Makefile.objs | 3 + hw/timer/m48t59-internal.h | 82 ++++++++++++++++ hw/timer/m48t59-isa.c | 180 +++++++++++++++++++++++++++++++++++ hw/timer/m48t59.c | 228 ++++----------------------------------------- 4 files changed, 283 insertions(+), 210 deletions(-) create mode 100644 hw/timer/m48t59-internal.h create mode 100644 hw/timer/m48t59-isa.c diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 133bd0d..803fde7 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -6,6 +6,9 @@ common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-$(CONFIG_HPET) += hpet.o common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o common-obj-$(CONFIG_M48T59) += m48t59.o +ifeq ($(CONFIG_ISA_BUS),y) +common-obj-$(CONFIG_M48T59) += m48t59-isa.o +endif common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_TWL92230) += twl92230.o diff --git a/hw/timer/m48t59-internal.h b/hw/timer/m48t59-internal.h new file mode 100644 index 0000000..c50f134 --- /dev/null +++ b/hw/timer/m48t59-internal.h @@ -0,0 +1,82 @@ +/* + * QEMU M48T59 and M48T08 NVRAM emulation (common header) + * + * Copyright (c) 2003-2005, 2007 Jocelyn Mayer + * Copyright (c) 2013 Hervé Poussineau + * + * 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. + */ +#ifndef HW_M48T59_H +#define HW_M48T59_H 1 + +//#define DEBUG_NVRAM + +#if defined(DEBUG_NVRAM) +#define NVRAM_PRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0) +#else +#define NVRAM_PRINTF(fmt, ...) do { } while (0) +#endif + +/* + * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has + * alarm and a watchdog timer and related control registers. In the + * PPC platform there is also a nvram lock function. + */ + +typedef struct M48txxInfo { + const char *bus_name; + uint32_t model; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */ + uint32_t size; +} M48txxInfo; + +typedef struct M48t59State { + /* Hardware parameters */ + qemu_irq IRQ; + MemoryRegion iomem; + uint32_t size; + int32_t base_year; + /* RTC management */ + time_t time_offset; + time_t stop_time; + /* Alarm & watchdog */ + struct tm alarm; + QEMUTimer *alrm_timer; + QEMUTimer *wd_timer; + /* NVRAM storage */ + uint8_t *buffer; + /* Model parameters */ + uint32_t model; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */ + /* NVRAM storage */ + uint16_t addr; + uint8_t lock; +} M48t59State; + +uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr); +void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val); +void m48t59_reset_common(M48t59State *NVRAM); +void m48t59_realize_common(M48t59State *s, Error **errp); + +static inline void m48t59_toggle_lock(M48t59State *NVRAM, int lock) +{ + NVRAM->lock ^= 1 << lock; +} + +extern const MemoryRegionOps m48t59_io_ops; + +#endif /* HW_M48T59_H */ diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c new file mode 100644 index 0000000..3a521dc --- /dev/null +++ b/hw/timer/m48t59-isa.c @@ -0,0 +1,180 @@ +/* + * QEMU M48T59 and M48T08 NVRAM emulation (ISA bus interface + * + * Copyright (c) 2003-2005, 2007 Jocelyn Mayer + * Copyright (c) 2013 Hervé Poussineau + * + * 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. + */ +#include "hw/isa/isa.h" +#include "hw/timer/m48t59.h" +#include "m48t59-internal.h" + +#define TYPE_M48TXX_ISA "isa-m48txx" +#define M48TXX_ISA_GET_CLASS(obj) \ + OBJECT_GET_CLASS(M48txxISADeviceClass, (obj), TYPE_M48TXX_ISA) +#define M48TXX_ISA_CLASS(klass) \ + OBJECT_CLASS_CHECK(M48txxISADeviceClass, (klass), TYPE_M48TXX_ISA) +#define M48TXX_ISA(obj) \ + OBJECT_CHECK(M48txxISAState, (obj), TYPE_M48TXX_ISA) + +typedef struct M48txxISAState { + ISADevice parent_obj; + M48t59State state; + uint32_t io_base; + MemoryRegion io; +} M48txxISAState; + +typedef struct M48txxISADeviceClass { + ISADeviceClass parent_class; + M48txxInfo info; +} M48txxISADeviceClass; + +static M48txxInfo m48txx_isa_info[] = { + { + .bus_name = "isa-m48t59", + .model = 59, + .size = 0x2000, + } +}; + +Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, + int base_year, int model) +{ + DeviceState *dev; + int i; + + for (i = 0; i < ARRAY_SIZE(m48txx_isa_info); i++) { + if (m48txx_isa_info[i].size != size || + m48txx_isa_info[i].model != model) { + continue; + } + + dev = DEVICE(isa_create(bus, m48txx_isa_info[i].bus_name)); + qdev_prop_set_uint32(dev, "iobase", io_base); + qdev_prop_set_int32(dev, "base-year", base_year); + qdev_init_nofail(dev); + return NVRAM(dev); + } + + assert(false); + return NULL; +} + +static uint32_t m48txx_isa_read(Nvram *obj, uint32_t addr) +{ + M48txxISAState *d = M48TXX_ISA(obj); + return m48t59_read(&d->state, addr); +} + +static void m48txx_isa_write(Nvram *obj, uint32_t addr, uint32_t val) +{ + M48txxISAState *d = M48TXX_ISA(obj); + m48t59_write(&d->state, addr, val); +} + +static void m48txx_isa_toggle_lock(Nvram *obj, int lock) +{ + M48txxISAState *d = M48TXX_ISA(obj); + m48t59_toggle_lock(&d->state, lock); +} + +static Property m48t59_isa_properties[] = { + DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0), + DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74), + DEFINE_PROP_END_OF_LIST(), +}; + +static void m48t59_reset_isa(DeviceState *d) +{ + M48txxISAState *isa = M48TXX_ISA(d); + M48t59State *NVRAM = &isa->state; + + m48t59_reset_common(NVRAM); +} + +static void m48t59_isa_realize(DeviceState *dev, Error **errp) +{ + M48txxISADeviceClass *u = M48TXX_ISA_GET_CLASS(dev); + ISADevice *isadev = ISA_DEVICE(dev); + M48txxISAState *d = M48TXX_ISA(dev); + M48t59State *s = &d->state; + + s->model = u->info.model; + s->size = u->info.size; + isa_init_irq(isadev, &s->IRQ, 8); + m48t59_realize_common(s, errp); + memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4); + if (d->io_base != 0) { + isa_register_ioport(isadev, &d->io, d->io_base); + } +} + +static void m48txx_isa_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + NvramClass *nc = NVRAM_CLASS(klass); + + dc->realize = m48t59_isa_realize; + dc->reset = m48t59_reset_isa; + dc->props = m48t59_isa_properties; + nc->read = m48txx_isa_read; + nc->write = m48txx_isa_write; + nc->toggle_lock = m48txx_isa_toggle_lock; +} + +static void m48txx_isa_concrete_class_init(ObjectClass *klass, void *data) +{ + M48txxISADeviceClass *u = M48TXX_ISA_CLASS(klass); + M48txxInfo *info = data; + + u->info = *info; +} + +static const TypeInfo m48txx_isa_type_info = { + .name = TYPE_M48TXX_ISA, + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(M48txxISAState), + .abstract = true, + .class_init = m48txx_isa_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_NVRAM }, + { } + } +}; + +static void m48t59_isa_register_types(void) +{ + TypeInfo isa_type_info = { + .parent = TYPE_M48TXX_ISA, + .class_size = sizeof(M48txxISADeviceClass), + .class_init = m48txx_isa_concrete_class_init, + }; + int i; + + type_register_static(&m48txx_isa_type_info); + + for (i = 0; i < ARRAY_SIZE(m48txx_isa_info); i++) { + isa_type_info.name = m48txx_isa_info[i].bus_name; + isa_type_info.class_data = &m48txx_isa_info[i]; + type_register(&isa_type_info); + } +} + +type_init(m48t59_isa_register_types) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 8ab683d..ac90734 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -27,16 +27,9 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/isa/isa.h" #include "exec/address-spaces.h" -//#define DEBUG_NVRAM - -#if defined(DEBUG_NVRAM) -#define NVRAM_PRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0) -#else -#define NVRAM_PRINTF(fmt, ...) do { } while (0) -#endif +#include "m48t59-internal.h" #define TYPE_M48TXX_SYS_BUS "sysbus-m48txx" #define M48TXX_SYS_BUS_GET_CLASS(obj) \ @@ -46,27 +39,6 @@ #define M48TXX_SYS_BUS(obj) \ OBJECT_CHECK(M48txxSysBusState, (obj), TYPE_M48TXX_SYS_BUS) -#define TYPE_M48TXX_ISA "isa-m48txx" -#define M48TXX_ISA_GET_CLASS(obj) \ - OBJECT_GET_CLASS(M48txxISADeviceClass, (obj), TYPE_M48TXX_ISA) -#define M48TXX_ISA_CLASS(klass) \ - OBJECT_CLASS_CHECK(M48txxISADeviceClass, (klass), TYPE_M48TXX_ISA) -#define M48TXX_ISA(obj) \ - OBJECT_CHECK(M48txxISAState, (obj), TYPE_M48TXX_ISA) - -/* - * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has - * alarm and a watchdog timer and related control registers. In the - * PPC platform there is also a nvram lock function. - */ - -typedef struct M48txxInfo { - const char *isa_name; - const char *sysbus_name; - uint32_t model; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */ - uint32_t size; -} M48txxInfo; - /* * Chipset docs: * http://www.st.com/stonline/products/literature/ds/2410/m48t02.pdf @@ -74,40 +46,6 @@ typedef struct M48txxInfo { * http://www.st.com/stonline/products/literature/od/7001/m48t59y.pdf */ -typedef struct M48t59State { - /* Hardware parameters */ - qemu_irq IRQ; - MemoryRegion iomem; - uint32_t size; - int32_t base_year; - /* RTC management */ - time_t time_offset; - time_t stop_time; - /* Alarm & watchdog */ - struct tm alarm; - QEMUTimer *alrm_timer; - QEMUTimer *wd_timer; - /* NVRAM storage */ - uint8_t *buffer; - /* Model parameters */ - uint32_t model; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */ - /* NVRAM storage */ - uint16_t addr; - uint8_t lock; -} M48t59State; - -typedef struct M48txxISAState { - ISADevice parent_obj; - M48t59State state; - uint32_t io_base; - MemoryRegion io; -} M48txxISAState; - -typedef struct M48txxISADeviceClass { - ISADeviceClass parent_class; - M48txxInfo info; -} M48txxISADeviceClass; - typedef struct M48txxSysBusState { SysBusDevice parent_obj; M48t59State state; @@ -119,21 +57,17 @@ typedef struct M48txxSysBusDeviceClass { M48txxInfo info; } M48txxSysBusDeviceClass; -static M48txxInfo m48txx_info[] = { +static M48txxInfo m48txx_sysbus_info[] = { { - .sysbus_name = "sysbus-m48t02", + .bus_name = "sysbus-m48t02", .model = 2, .size = 0x800, },{ - .sysbus_name = "sysbus-m48t08", + .bus_name = "sysbus-m48t08", .model = 8, .size = 0x2000, },{ - .sysbus_name = "sysbus-m48t59", - .model = 59, - .size = 0x2000, - },{ - .isa_name = "isa-m48t59", + .bus_name = "sysbus-m48t59", .model = 59, .size = 0x2000, } @@ -245,7 +179,7 @@ static void set_up_watchdog(M48t59State *NVRAM, uint8_t value) } /* Direct access to NVRAM */ -static void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val) +void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val) { struct tm tm; int tmp; @@ -410,7 +344,7 @@ static void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val) } } -static uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr) +uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr) { struct tm tm; uint32_t retval = 0xFF; @@ -514,11 +448,6 @@ static uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr) return retval; } -static void m48t59_toggle_lock(M48t59State *NVRAM, int lock) -{ - NVRAM->lock ^= 1 << lock; -} - /* IO access to NVRAM */ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val, unsigned size) @@ -638,7 +567,7 @@ static const VMStateDescription vmstate_m48t59 = { } }; -static void m48t59_reset_common(M48t59State *NVRAM) +void m48t59_reset_common(M48t59State *NVRAM) { NVRAM->addr = 0; NVRAM->lock = 0; @@ -649,14 +578,6 @@ static void m48t59_reset_common(M48t59State *NVRAM) timer_del(NVRAM->wd_timer); } -static void m48t59_reset_isa(DeviceState *d) -{ - M48txxISAState *isa = M48TXX_ISA(d); - M48t59State *NVRAM = &isa->state; - - m48t59_reset_common(NVRAM); -} - static void m48t59_reset_sysbus(DeviceState *d) { M48txxSysBusState *sys = M48TXX_SYS_BUS(d); @@ -665,7 +586,7 @@ static void m48t59_reset_sysbus(DeviceState *d) m48t59_reset_common(NVRAM); } -static const MemoryRegionOps m48t59_io_ops = { +const MemoryRegionOps m48t59_io_ops = { .read = NVRAM_readb, .write = NVRAM_writeb, .impl = { @@ -684,14 +605,13 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, SysBusDevice *s; int i; - for (i = 0; i < ARRAY_SIZE(m48txx_info); i++) { - if (!m48txx_info[i].sysbus_name || - m48txx_info[i].size != size || - m48txx_info[i].model != model) { + for (i = 0; i < ARRAY_SIZE(m48txx_sysbus_info); i++) { + if (m48txx_sysbus_info[i].size != size || + m48txx_sysbus_info[i].model != model) { continue; } - dev = qdev_create(NULL, m48txx_info[i].sysbus_name); + dev = qdev_create(NULL, m48txx_sysbus_info[i].bus_name); qdev_prop_set_int32(dev, "base-year", base_year); qdev_init_nofail(dev); s = SYS_BUS_DEVICE(dev); @@ -711,31 +631,7 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, return NULL; } -Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, - int base_year, int model) -{ - DeviceState *dev; - int i; - - for (i = 0; i < ARRAY_SIZE(m48txx_info); i++) { - if (!m48txx_info[i].isa_name || - m48txx_info[i].size != size || - m48txx_info[i].model != model) { - continue; - } - - dev = DEVICE(isa_create(bus, m48txx_info[i].isa_name)); - qdev_prop_set_uint32(dev, "iobase", io_base); - qdev_prop_set_int32(dev, "base-year", base_year); - qdev_init_nofail(dev); - return NVRAM(dev); - } - - assert(false); - return NULL; -} - -static void m48t59_realize_common(M48t59State *s, Error **errp) +void m48t59_realize_common(M48t59State *s, Error **errp) { s->buffer = g_malloc0(s->size); if (s->model == 59) { @@ -747,23 +643,6 @@ static void m48t59_realize_common(M48t59State *s, Error **errp) vmstate_register(NULL, -1, &vmstate_m48t59, s); } -static void m48t59_isa_realize(DeviceState *dev, Error **errp) -{ - M48txxISADeviceClass *u = M48TXX_ISA_GET_CLASS(dev); - ISADevice *isadev = ISA_DEVICE(dev); - M48txxISAState *d = M48TXX_ISA(dev); - M48t59State *s = &d->state; - - s->model = u->info.model; - s->size = u->info.size; - isa_init_irq(isadev, &s->IRQ, 8); - m48t59_realize_common(s, errp); - memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4); - if (d->io_base != 0) { - isa_register_ioport(isadev, &d->io, d->io_base); - } -} - static int m48t59_init1(SysBusDevice *dev) { M48txxSysBusDeviceClass *u = M48TXX_SYS_BUS_GET_CLASS(dev); @@ -790,51 +669,6 @@ static int m48t59_init1(SysBusDevice *dev) return 0; } -static uint32_t m48txx_isa_read(Nvram *obj, uint32_t addr) -{ - M48txxISAState *d = M48TXX_ISA(obj); - return m48t59_read(&d->state, addr); -} - -static void m48txx_isa_write(Nvram *obj, uint32_t addr, uint32_t val) -{ - M48txxISAState *d = M48TXX_ISA(obj); - m48t59_write(&d->state, addr, val); -} - -static void m48txx_isa_toggle_lock(Nvram *obj, int lock) -{ - M48txxISAState *d = M48TXX_ISA(obj); - m48t59_toggle_lock(&d->state, lock); -} - -static Property m48t59_isa_properties[] = { - DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0), - DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74), - DEFINE_PROP_END_OF_LIST(), -}; - -static void m48txx_isa_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - NvramClass *nc = NVRAM_CLASS(klass); - - dc->realize = m48t59_isa_realize; - dc->reset = m48t59_reset_isa; - dc->props = m48t59_isa_properties; - nc->read = m48txx_isa_read; - nc->write = m48txx_isa_write; - nc->toggle_lock = m48txx_isa_toggle_lock; -} - -static void m48txx_isa_concrete_class_init(ObjectClass *klass, void *data) -{ - M48txxISADeviceClass *u = M48TXX_ISA_CLASS(klass); - M48txxInfo *info = data; - - u->info = *info; -} - static uint32_t m48txx_sysbus_read(Nvram *obj, uint32_t addr) { M48txxSysBusState *d = M48TXX_SYS_BUS(obj); @@ -898,18 +732,6 @@ static const TypeInfo m48txx_sysbus_type_info = { } }; -static const TypeInfo m48txx_isa_type_info = { - .name = TYPE_M48TXX_ISA, - .parent = TYPE_ISA_DEVICE, - .instance_size = sizeof(M48txxISAState), - .abstract = true, - .class_init = m48txx_isa_class_init, - .interfaces = (InterfaceInfo[]) { - { TYPE_NVRAM }, - { } - } -}; - static void m48t59_register_types(void) { TypeInfo sysbus_type_info = { @@ -917,29 +739,15 @@ static void m48t59_register_types(void) .class_size = sizeof(M48txxSysBusDeviceClass), .class_init = m48txx_sysbus_concrete_class_init, }; - TypeInfo isa_type_info = { - .parent = TYPE_M48TXX_ISA, - .class_size = sizeof(M48txxISADeviceClass), - .class_init = m48txx_isa_concrete_class_init, - }; int i; type_register_static(&nvram_info); type_register_static(&m48txx_sysbus_type_info); - type_register_static(&m48txx_isa_type_info); - for (i = 0; i < ARRAY_SIZE(m48txx_info); i++) { - if (m48txx_info[i].sysbus_name) { - sysbus_type_info.name = m48txx_info[i].sysbus_name; - sysbus_type_info.class_data = &m48txx_info[i]; - type_register(&sysbus_type_info); - } - - if (m48txx_info[i].isa_name) { - isa_type_info.name = m48txx_info[i].isa_name; - isa_type_info.class_data = &m48txx_info[i]; - type_register(&isa_type_info); - } + for (i = 0; i < ARRAY_SIZE(m48txx_sysbus_info); i++) { + sysbus_type_info.name = m48txx_sysbus_info[i].bus_name; + sysbus_type_info.class_data = &m48txx_sysbus_info[i]; + type_register(&sysbus_type_info); } } -- 2.4.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson ` (3 preceding siblings ...) 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 4/4] Split ISA and sysbus versions of m48t59 device David Gibson @ 2015-07-02 6:19 ` Michael S. Tsirkin 2015-07-02 8:47 ` Michael S. Tsirkin 2015-07-04 23:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt 5 siblings, 1 reply; 11+ messages in thread From: Michael S. Tsirkin @ 2015-07-02 6:19 UTC (permalink / raw) To: David Gibson Cc: lvivier, peter.maydell, thuth, qemu-devel, armbru, agraf, lcapitulino, qemu-ppc, peter.crosthwaite, afaerber On Thu, Jul 02, 2015 at 03:53:43PM +1000, David Gibson wrote: > At the moment isa-bus.c is compiled unconditionally for all targets. > However, some targets have never used legacy ISA devices. Many more > targets have at least some machine types without ISA. > > These patches allow ISA bus to be disabled in the configuration, thus > allowing cut down configurations for targets and machine types that > don't have ISA. > > Actually turning off ISA will require more than this for most targets > - there are a number of non-obvious dependencies on the ISA code. > b19c1c0 "isa: remove isa_mem_base variable" already got rid of an > important one (VGA depended on ISA). Patches 2/4 and 4/4 in this > series remove some more. There are a number more though, for example > CONFIG_IDE_CORE depends on ISA and the HMP "info irq" command depends > on I8259 code. > > This patch should allow easier experimentation so we can chip away at > those dependencies on legacy code in the future. > > Changes in v2: > * Removed changes to HMP, since it would cause a regression for PReP > * Added a cleanup of the dead CONFIG_ISA_MMIO variable > * Clearer explanation of the situation in commit messages Overall I don't have a problem with this. I think this needs to be deferred until after 2.4 though, pls remember to re-post then. > David Gibson (4): > Cleanup leftover CONFIG_ISA_MMIO > Split serial-isa into its own config option > Allow ISA bus to be configured out > Split ISA and sysbus versions of m48t59 device > > default-configs/alpha-softmmu.mak | 1 + > default-configs/arm-softmmu.mak | 2 +- > default-configs/i386-softmmu.mak | 1 + > default-configs/mips-softmmu.mak | 1 + > default-configs/mips64-softmmu.mak | 1 + > default-configs/mips64el-softmmu.mak | 1 + > default-configs/mipsel-softmmu.mak | 1 + > default-configs/moxie-softmmu.mak | 1 + > default-configs/pci.mak | 1 + > default-configs/ppc-softmmu.mak | 2 +- > default-configs/ppc64-softmmu.mak | 2 +- > default-configs/ppcemb-softmmu.mak | 1 + > default-configs/sh4-softmmu.mak | 1 + > default-configs/sh4eb-softmmu.mak | 1 + > default-configs/sparc-softmmu.mak | 1 + > default-configs/sparc64-softmmu.mak | 2 +- > default-configs/unicore32-softmmu.mak | 1 + > default-configs/x86_64-softmmu.mak | 1 + > hw/char/Makefile.objs | 3 +- > hw/isa/Makefile.objs | 2 +- > hw/timer/Makefile.objs | 3 + > hw/timer/m48t59-internal.h | 82 ++++++++++++ > hw/timer/m48t59-isa.c | 180 +++++++++++++++++++++++++++ > hw/timer/m48t59.c | 228 +++------------------------------- > 24 files changed, 304 insertions(+), 216 deletions(-) > create mode 100644 hw/timer/m48t59-internal.h > create mode 100644 hw/timer/m48t59-isa.c > > -- > 2.4.3 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out 2015-07-02 6:19 ` [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out Michael S. Tsirkin @ 2015-07-02 8:47 ` Michael S. Tsirkin 0 siblings, 0 replies; 11+ messages in thread From: Michael S. Tsirkin @ 2015-07-02 8:47 UTC (permalink / raw) To: David Gibson Cc: lvivier, peter.maydell, thuth, qemu-devel, armbru, agraf, lcapitulino, qemu-ppc, peter.crosthwaite, afaerber On Thu, Jul 02, 2015 at 08:19:28AM +0200, Michael S. Tsirkin wrote: > On Thu, Jul 02, 2015 at 03:53:43PM +1000, David Gibson wrote: > > At the moment isa-bus.c is compiled unconditionally for all targets. > > However, some targets have never used legacy ISA devices. Many more > > targets have at least some machine types without ISA. > > > > These patches allow ISA bus to be disabled in the configuration, thus > > allowing cut down configurations for targets and machine types that > > don't have ISA. > > > > Actually turning off ISA will require more than this for most targets > > - there are a number of non-obvious dependencies on the ISA code. > > b19c1c0 "isa: remove isa_mem_base variable" already got rid of an > > important one (VGA depended on ISA). Patches 2/4 and 4/4 in this > > series remove some more. There are a number more though, for example > > CONFIG_IDE_CORE depends on ISA and the HMP "info irq" command depends > > on I8259 code. > > > > This patch should allow easier experimentation so we can chip away at > > those dependencies on legacy code in the future. > > > > Changes in v2: > > * Removed changes to HMP, since it would cause a regression for PReP > > * Added a cleanup of the dead CONFIG_ISA_MMIO variable > > * Clearer explanation of the situation in commit messages > > Overall I don't have a problem with this. > I think this needs to be deferred until after 2.4 though, > pls remember to re-post then. Looks like v1 was posted before freeze. I take this back, and defer the decision to whoever merges this. > > David Gibson (4): > > Cleanup leftover CONFIG_ISA_MMIO > > Split serial-isa into its own config option > > Allow ISA bus to be configured out > > Split ISA and sysbus versions of m48t59 device > > > > default-configs/alpha-softmmu.mak | 1 + > > default-configs/arm-softmmu.mak | 2 +- > > default-configs/i386-softmmu.mak | 1 + > > default-configs/mips-softmmu.mak | 1 + > > default-configs/mips64-softmmu.mak | 1 + > > default-configs/mips64el-softmmu.mak | 1 + > > default-configs/mipsel-softmmu.mak | 1 + > > default-configs/moxie-softmmu.mak | 1 + > > default-configs/pci.mak | 1 + > > default-configs/ppc-softmmu.mak | 2 +- > > default-configs/ppc64-softmmu.mak | 2 +- > > default-configs/ppcemb-softmmu.mak | 1 + > > default-configs/sh4-softmmu.mak | 1 + > > default-configs/sh4eb-softmmu.mak | 1 + > > default-configs/sparc-softmmu.mak | 1 + > > default-configs/sparc64-softmmu.mak | 2 +- > > default-configs/unicore32-softmmu.mak | 1 + > > default-configs/x86_64-softmmu.mak | 1 + > > hw/char/Makefile.objs | 3 +- > > hw/isa/Makefile.objs | 2 +- > > hw/timer/Makefile.objs | 3 + > > hw/timer/m48t59-internal.h | 82 ++++++++++++ > > hw/timer/m48t59-isa.c | 180 +++++++++++++++++++++++++++ > > hw/timer/m48t59.c | 228 +++------------------------------- > > 24 files changed, 304 insertions(+), 216 deletions(-) > > create mode 100644 hw/timer/m48t59-internal.h > > create mode 100644 hw/timer/m48t59-isa.c > > > > -- > > 2.4.3 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCHv2 0/4] Start allowing ISA to be configured out 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson ` (4 preceding siblings ...) 2015-07-02 6:19 ` [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out Michael S. Tsirkin @ 2015-07-04 23:36 ` Benjamin Herrenschmidt 2015-07-05 9:59 ` David Gibson 5 siblings, 1 reply; 11+ messages in thread From: Benjamin Herrenschmidt @ 2015-07-04 23:36 UTC (permalink / raw) To: David Gibson Cc: lvivier, peter.maydell, thuth, mst, qemu-devel, armbru, agraf, lcapitulino, qemu-ppc, peter.crosthwaite, afaerber On Thu, 2015-07-02 at 15:53 +1000, David Gibson wrote: > default-configs/ppc64-softmmu.mak | 2 +- Note: My native POWER8 work will need ISA back here, so maybe don't remove it ? The P8 chip has an LPC bus which is effectively an serialized variant of an ISA bus and I'm representing it as such in qemu, adding ISA serial and RTC (and soon IPMI BT when those patches get in) to it. Cheers, Ben. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCHv2 0/4] Start allowing ISA to be configured out 2015-07-04 23:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt @ 2015-07-05 9:59 ` David Gibson 0 siblings, 0 replies; 11+ messages in thread From: David Gibson @ 2015-07-05 9:59 UTC (permalink / raw) To: Benjamin Herrenschmidt Cc: lvivier, peter.maydell, thuth, mst, qemu-devel, armbru, agraf, lcapitulino, qemu-ppc, peter.crosthwaite, afaerber [-- Attachment #1: Type: text/plain, Size: 747 bytes --] On Sun, Jul 05, 2015 at 09:36:38AM +1000, Benjamin Herrenschmidt wrote: > On Thu, 2015-07-02 at 15:53 +1000, David Gibson wrote: > > default-configs/ppc64-softmmu.mak | 2 +- > > Note: My native POWER8 work will need ISA back here, so maybe don't > remove it ? So far this series doesn't remove anything - it removes CONFIG_ISA_MMIO which didn't do anything anyway, and adds CONFIG_SERIAL_ISA, since its no longer implied by CONFIG_SERIAL. The series just allows things to be removed, it doesn't actually remove them from ppc64. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-07-05 10:08 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-02 5:53 [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 1/4] Cleanup leftover CONFIG_ISA_MMIO David Gibson 2015-07-02 8:06 ` Peter Maydell 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 2/4] Split serial-isa into its own config option David Gibson 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 3/4] Allow ISA bus to be configured out David Gibson 2015-07-02 8:45 ` Michael S. Tsirkin 2015-07-02 5:53 ` [Qemu-devel] [PATCHv2 4/4] Split ISA and sysbus versions of m48t59 device David Gibson 2015-07-02 6:19 ` [Qemu-devel] [PATCHv2 0/4] Start allowing ISA to be configured out Michael S. Tsirkin 2015-07-02 8:47 ` Michael S. Tsirkin 2015-07-04 23:36 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt 2015-07-05 9:59 ` David Gibson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).