On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <phi...@redhat.com>
wrote:
> From: Philippe Mathieu-Daudé <f4...@amsat.org>
>
> Remove mc146818rtc instanciated in malta board, to not have it twice.
>
> Acked-by: Michael S. Tsirkin <m...@redhat.com>
> Acked-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Hervé Poussineau <hpous...@reactos.org>
> Message-Id: <20171216090228.28505-13-hpous...@reactos.org>
> [PMD: rebased, set RTC base_year to 2000]
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> MAINTAINERS | 3 ++-
> hw/acpi/piix4.c | 2 +-
> hw/i386/acpi-build.c | 3 +--
> hw/i386/pc_piix.c | 1 +
> hw/isa/piix4.c | 22 ++++++++++++++++++++++
> hw/mips/mips_malta.c | 4 +---
> include/hw/acpi/piix4.h | 6 ------
> include/hw/i386/pc.h | 6 ------
> include/hw/southbridge/piix.h | 20 ++++++++++++++++++++
> 9 files changed, 48 insertions(+), 19 deletions(-)
> delete mode 100644 include/hw/acpi/piix4.h
> create mode 100644 include/hw/southbridge/piix.h
>
>
Reviewed-by: Aleksandar Markovic <amarko...@wavecomp.com>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c9f625fc2e..556f58bd8c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1235,7 +1235,7 @@ F: hw/i2c/smbus_ich9.c
> F: hw/acpi/piix4.c
> F: hw/acpi/ich9.c
> F: include/hw/acpi/ich9.h
> -F: include/hw/acpi/piix4.h
> +F: include/hw/southbridge/piix.h
> F: hw/misc/sga.c
> F: hw/isa/apm.c
> F: include/hw/isa/apm.h
> @@ -1720,6 +1720,7 @@ M: Hervé Poussineau <hpous...@reactos.org>
> M: Philippe Mathieu-Daudé <f4...@amsat.org>
> S: Maintained
> F: hw/isa/piix4.c
> +F: include/hw/southbridge/piix.h
>
> Firmware configuration (fw_cfg)
> M: Philippe Mathieu-Daudé <phi...@redhat.com>
> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
> index 1d29d438c7..27270621ab 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -21,6 +21,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/i386/pc.h"
> +#include "hw/southbridge/piix.h"
> #include "hw/irq.h"
> #include "hw/isa/apm.h"
> #include "hw/i2c/pm_smbus.h"
> @@ -33,7 +34,6 @@
> #include "qapi/error.h"
> #include "qemu/range.h"
> #include "exec/address-spaces.h"
> -#include "hw/acpi/piix4.h"
> #include "hw/acpi/pcihp.h"
> #include "hw/acpi/cpu_hotplug.h"
> #include "hw/acpi/cpu.h"
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 4e0f9f425a..aa6fe61191 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -34,7 +34,6 @@
> #include "hw/acpi/acpi-defs.h"
> #include "hw/acpi/acpi.h"
> #include "hw/acpi/cpu.h"
> -#include "hw/acpi/piix4.h"
> #include "hw/nvram/fw_cfg.h"
> #include "hw/acpi/bios-linker-loader.h"
> #include "hw/isa/isa.h"
> @@ -52,7 +51,7 @@
> #include "sysemu/reset.h"
>
> /* Supported chipsets: */
> -#include "hw/acpi/piix4.h"
> +#include "hw/southbridge/piix.h"
> #include "hw/acpi/pcihp.h"
> #include "hw/i386/ich9.h"
> #include "hw/pci/pci_bus.h"
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 6824b72124..431965d921 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -29,6 +29,7 @@
> #include "hw/loader.h"
> #include "hw/i386/pc.h"
> #include "hw/i386/apic.h"
> +#include "hw/southbridge/piix.h"
> #include "hw/display/ramfb.h"
> #include "hw/firmware/smbios.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 0b0a0ecab1..9f554747af 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -24,6 +24,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qapi/error.h"
> #include "hw/irq.h"
> #include "hw/i386/pc.h"
> #include "hw/pci/pci.h"
> @@ -31,6 +32,7 @@
> #include "hw/sysbus.h"
> #include "hw/dma/i8257.h"
> #include "hw/timer/i8254.h"
> +#include "hw/timer/mc146818rtc.h"
> #include "migration/vmstate.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> @@ -42,6 +44,7 @@ typedef struct PIIX4State {
> qemu_irq cpu_intr;
> qemu_irq *isa;
>
> + RTCState rtc;
> /* Reset Control Register */
> MemoryRegion rcr_mem;
> uint8_t rcr;
> @@ -144,6 +147,7 @@ static void piix4_realize(PCIDevice *pci_dev, Error
> **errp)
> PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev);
> ISABus *isa_bus;
> qemu_irq *i8259_out_irq;
> + Error *err = NULL;
>
> isa_bus = isa_bus_new(dev, pci_address_space(pci_dev),
> pci_address_space_io(pci_dev), errp);
> @@ -172,9 +176,26 @@ static void piix4_realize(PCIDevice *pci_dev, Error
> **errp)
> /* DMA */
> i8257_dma_init(isa_bus, 0);
>
> + /* RTC */
> + qdev_set_parent_bus(DEVICE(&s->rtc), BUS(isa_bus));
> + qdev_prop_set_int32(DEVICE(&s->rtc), "base_year", 2000);
> + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> + isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ);
> +
> piix4_dev = pci_dev;
> }
>
> +static void piix4_init(Object *obj)
> +{
> + PIIX4State *s = PIIX4_PCI_DEVICE(obj);
> +
> + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_MC146818_RTC);
> +}
> +
> static void piix4_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -199,6 +220,7 @@ static const TypeInfo piix4_info = {
> .name = TYPE_PIIX4_PCI_DEVICE,
> .parent = TYPE_PCI_DEVICE,
> .instance_size = sizeof(PIIX4State),
> + .instance_init = piix4_init,
> .class_init = piix4_class_init,
> .interfaces = (InterfaceInfo[]) {
> { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 16d7a0e785..528c34a1c3 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -26,7 +26,7 @@
> #include "qemu/units.h"
> #include "qemu-common.h"
> #include "cpu.h"
> -#include "hw/i386/pc.h"
> +#include "hw/southbridge/piix.h"
> #include "hw/isa/superio.h"
> #include "hw/char/serial.h"
> #include "net/net.h"
> @@ -44,7 +44,6 @@
> #include "hw/irq.h"
> #include "hw/loader.h"
> #include "elf.h"
> -#include "hw/timer/mc146818rtc.h"
> #include "exec/address-spaces.h"
> #include "hw/sysbus.h" /* SysBusDevice */
> #include "qemu/host-utils.h"
> @@ -1425,7 +1424,6 @@ void mips_malta_init(MachineState *machine)
> pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");
> smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
> isa_get_irq(NULL, 9), NULL, 0, NULL);
> - mc146818_rtc_init(isa_bus, 2000, NULL);
>
> /* generate SPD EEPROM data */
> generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size);
> diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h
> deleted file mode 100644
> index 028bb53e3d..0000000000
> --- a/include/hw/acpi/piix4.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef HW_ACPI_PIIX4_H
> -#define HW_ACPI_PIIX4_H
> -
> -#define TYPE_PIIX4_PM "PIIX4_PM"
> -
> -#endif
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index a95eab0d8a..c671c9fd2a 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -244,12 +244,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0);
>
> #define PORT92_A20_LINE "a20"
>
> -/* acpi_piix.c */
> -
> -I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> - qemu_irq sci_irq, qemu_irq smi_irq,
> - int smm_enabled, DeviceState **piix4_pm);
> -
> /* hpet.c */
> extern int no_hpet;
>
> diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
> new file mode 100644
> index 0000000000..b8ce26fec4
> --- /dev/null
> +++ b/include/hw/southbridge/piix.h
> @@ -0,0 +1,20 @@
> +/*
> + * QEMU PIIX South Bridge Emulation
> + *
> + * Copyright (c) 2006 Fabrice Bellard
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> later.
> + * See the COPYING file in the top-level directory.
> + *
> + */
> +
> +#ifndef HW_SOUTHBRIDGE_PIIX_H
> +#define HW_SOUTHBRIDGE_PIIX_H
> +
> +#define TYPE_PIIX4_PM "PIIX4_PM"
> +
> +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq, qemu_irq smi_irq,
> + int smm_enabled, DeviceState **piix4_pm);
> +
> +#endif
> --
> 2.21.0
>
>
>
