Commit fff123b8 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Philippe Mathieu-Daudé
Browse files

piix4: Add a MC146818 RTC Controller as specified in datasheet 



Remove mc146818rtc instanciated in malta board, to not have it twice.

Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Message-Id: <20171216090228.28505-13-hpoussin@reactos.org>
[PMD: rebased, set RTC base_year to 2000]
Reviewed-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent f9b3cd56

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,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
@@ -1757,6 +1757,7 @@ M: Hervé Poussineau <hpoussin@reactos.org> 
M: Philippe Mathieu-Daudé <f4bug@amsat.org>

S: Maintained

F: hw/isa/piix4.c

F: include/hw/southbridge/piix.h



Firmware configuration (fw_cfg)

M: Philippe Mathieu-Daudé <philmd@redhat.com>

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -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"
@@ -32,7 +33,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"

hw/i386/acpi-build.c

+1 −2
Original line number Diff line number Diff line
@@ -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"

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/i386/x86.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"

hw/isa/piix4.c

+22 −0
Original line number Diff line number Diff line
@@ -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/rtc/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;
@@ -145,6 +148,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) 
    PIIX4State *s = PIIX4_PCI_DEVICE(dev);

    ISABus *isa_bus;

    qemu_irq *i8259_out_irq;

    Error *err = NULL;



    isa_bus = isa_bus_new(DEVICE(dev), pci_address_space(dev),

                          pci_address_space_io(dev), errp);
@@ -175,9 +179,26 @@ static void piix4_realize(PCIDevice *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 = 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);
@@ -202,6 +223,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 },