ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm: add PCIe to Freescale i.MX6 

Signed-off-by: Nikita Ostrenkov <n.ostrenkov@gmail.com>
Message-id: 20240108140325.1291-1-n.ostrenkov@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Nikita Ostrenkov 2024-01-08 14:03:25 +00:00 committed by Peter Maydell
parent ee0a2e3c9d
commit 5e6be95ed1
3 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/Kconfig
View File

@ -547,6 +547,7 @@ config FSL_IMX31
config FSL_IMX6 config FSL_IMX6
bool bool
imply PCIE_DEVICES
imply I2C_DEVICES imply I2C_DEVICES
select A9MPCORE select A9MPCORE
select IMX select IMX
@ -555,6 +556,7 @@ config FSL_IMX6
select IMX_USBPHY select IMX_USBPHY
select WDT_IMX2 select WDT_IMX2
select PL310 # cache controller select PL310 # cache controller
select PCI_EXPRESS_DESIGNWARE
select SDHCI select SDHCI
config ASPEED_SOC config ASPEED_SOC

25
hw/arm/fsl-imx6.c
View File

@ -22,6 +22,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/arm/fsl-imx6.h" #include "hw/arm/fsl-imx6.h"
#include "hw/misc/unimp.h"
#include "hw/usb/imx-usb-phy.h" #include "hw/usb/imx-usb-phy.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -103,6 +104,8 @@ static void fsl_imx6_init(Object *obj)
object_initialize_child(obj, "eth", &s->eth, TYPE_IMX_ENET); object_initialize_child(obj, "eth", &s->eth, TYPE_IMX_ENET);
object_initialize_child(obj, "pcie", &s->pcie, TYPE_DESIGNWARE_PCIE_HOST);
} }
static void fsl_imx6_realize(DeviceState *dev, Error **errp) static void fsl_imx6_realize(DeviceState *dev, Error **errp)
@ -110,6 +113,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());
FslIMX6State *s = FSL_IMX6(dev); FslIMX6State *s = FSL_IMX6(dev);
uint16_t i; uint16_t i;
qemu_irq irq;
unsigned int smp_cpus = ms->smp.cpus; unsigned int smp_cpus = ms->smp.cpus;
if (smp_cpus > FSL_IMX6_NUM_CPUS) { if (smp_cpus > FSL_IMX6_NUM_CPUS) {
@ -425,6 +429,27 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
FSL_IMX6_WDOGn_IRQ[i])); FSL_IMX6_WDOGn_IRQ[i]));
} }
/*
* PCIe
*/
sysbus_realize(SYS_BUS_DEVICE(&s->pcie), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->pcie), 0, FSL_IMX6_PCIe_REG_ADDR);
irq = qdev_get_gpio_in(DEVICE(&s->a9mpcore), FSL_IMX6_PCIE1_IRQ);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 0, irq);
irq = qdev_get_gpio_in(DEVICE(&s->a9mpcore), FSL_IMX6_PCIE2_IRQ);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 1, irq);
irq = qdev_get_gpio_in(DEVICE(&s->a9mpcore), FSL_IMX6_PCIE3_IRQ);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 2, irq);
irq = qdev_get_gpio_in(DEVICE(&s->a9mpcore), FSL_IMX6_PCIE4_IRQ);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 3, irq);
/*
* PCIe PHY
*/
create_unimplemented_device("pcie-phy", FSL_IMX6_PCIe_ADDR,
FSL_IMX6_PCIe_SIZE);
/* ROM memory */ /* ROM memory */
if (!memory_region_init_rom(&s->rom, OBJECT(dev), "imx6.rom", if (!memory_region_init_rom(&s->rom, OBJECT(dev), "imx6.rom",
FSL_IMX6_ROM_SIZE, errp)) { FSL_IMX6_ROM_SIZE, errp)) {

44
include/hw/arm/fsl-imx6.h
View File

@ -32,6 +32,7 @@
#include "hw/net/imx_fec.h" #include "hw/net/imx_fec.h"
#include "hw/usb/chipidea.h" #include "hw/usb/chipidea.h"
#include "hw/usb/imx-usb-phy.h" #include "hw/usb/imx-usb-phy.h"
#include "hw/pci-host/designware.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "cpu.h" #include "cpu.h"
#include "qom/object.h" #include "qom/object.h"
@ -55,27 +56,28 @@ struct FslIMX6State {
DeviceState parent_obj; DeviceState parent_obj;
/*< public >*/ /*< public >*/
ARMCPU cpu[FSL_IMX6_NUM_CPUS]; ARMCPU cpu[FSL_IMX6_NUM_CPUS];
A9MPPrivState a9mpcore; A9MPPrivState a9mpcore;
IMX6CCMState ccm; IMX6CCMState ccm;
IMX6SRCState src; IMX6SRCState src;
IMX7SNVSState snvs; IMX7SNVSState snvs;
IMXSerialState uart[FSL_IMX6_NUM_UARTS]; IMXSerialState uart[FSL_IMX6_NUM_UARTS];
IMXGPTState gpt; IMXGPTState gpt;
IMXEPITState epit[FSL_IMX6_NUM_EPITS]; IMXEPITState epit[FSL_IMX6_NUM_EPITS];
IMXI2CState i2c[FSL_IMX6_NUM_I2CS]; IMXI2CState i2c[FSL_IMX6_NUM_I2CS];
IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS]; IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS];
SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS];
IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; IMXSPIState spi[FSL_IMX6_NUM_ECSPIS];
IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; IMX2WdtState wdt[FSL_IMX6_NUM_WDTS];
IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS]; IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS];
ChipideaState usb[FSL_IMX6_NUM_USBS]; ChipideaState usb[FSL_IMX6_NUM_USBS];
IMXFECState eth; IMXFECState eth;
MemoryRegion rom; DesignwarePCIEHost pcie;
MemoryRegion caam; MemoryRegion rom;
MemoryRegion ocram; MemoryRegion caam;
MemoryRegion ocram_alias; MemoryRegion ocram;
uint32_t phy_num; MemoryRegion ocram_alias;
uint32_t phy_num;
}; };