david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: allwinner-a10: Add SATA

Browse Source 
Add the Allwinner A10 AHCI controller module to the SoC.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 69d6962f2d14a218bd07e9ac4ccd1947737cc30f.1445917756.git.crosthwaite.peter@gmail.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Peter Crosthwaite 2015-11-06 14:09:01 -05:00 committed by John Snow
parent 377e214539
commit dca625768a
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/allwinner-a10.c
View File

@ -39,6 +39,9 @@ static void aw_a10_init(Object *obj)
qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC); qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);
qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]); qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
} }
object_initialize(&s->sata, sizeof(s->sata), TYPE_ALLWINNER_AHCI);
qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default());
} }
static void aw_a10_realize(DeviceState *dev, Error **errp) static void aw_a10_realize(DeviceState *dev, Error **errp)
@ -93,6 +96,14 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE); sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE);
sysbus_connect_irq(sysbusdev, 0, s->irq[55]); sysbus_connect_irq(sysbusdev, 0, s->irq[55]);
object_property_set_bool(OBJECT(&s->sata), true, "realized", &err);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, AW_A10_SATA_BASE);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, s->irq[56]);
/* FIXME use a qdev chardev prop instead of serial_hds[] */ /* FIXME use a qdev chardev prop instead of serial_hds[] */
serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1], serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1],
115200, serial_hds[0], DEVICE_NATIVE_ENDIAN); 115200, serial_hds[0], DEVICE_NATIVE_ENDIAN);

4
include/hw/arm/allwinner-a10.h
View File

@ -7,6 +7,8 @@
#include "hw/timer/allwinner-a10-pit.h" #include "hw/timer/allwinner-a10-pit.h"
#include "hw/intc/allwinner-a10-pic.h" #include "hw/intc/allwinner-a10-pic.h"
#include "hw/net/allwinner_emac.h" #include "hw/net/allwinner_emac.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
@ -16,6 +18,7 @@
#define AW_A10_PIT_REG_BASE 0x01c20c00 #define AW_A10_PIT_REG_BASE 0x01c20c00
#define AW_A10_UART0_REG_BASE 0x01c28000 #define AW_A10_UART0_REG_BASE 0x01c28000
#define AW_A10_EMAC_BASE 0x01c0b000 #define AW_A10_EMAC_BASE 0x01c0b000
#define AW_A10_SATA_BASE 0x01c18000
#define AW_A10_SDRAM_BASE 0x40000000 #define AW_A10_SDRAM_BASE 0x40000000
@ -32,6 +35,7 @@ typedef struct AwA10State {
AwA10PITState timer; AwA10PITState timer;
AwA10PICState intc; AwA10PICState intc;
AwEmacState emac; AwEmacState emac;
AllwinnerAHCIState sata;
} AwA10State; } AwA10State;
#define ALLWINNER_H_ #define ALLWINNER_H_