| Message ID | 20240107165702.47819-1-n.ostrenkov@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm: add PCIe to Freescale i.MX6 | expand |
Hi Nikita, On 7/1/24 17:57, Nikita Ostrenkov wrote: > Signed-off-by: Nikita Ostrenkov <n.ostrenkov@gmail.com> > --- > hw/arm/Kconfig | 3 +++ > hw/arm/fsl-imx6.c | 25 ++++++++++++++++++++++ > include/hw/arm/fsl-imx6.h | 44 ++++++++++++++++++++------------------- > 3 files changed, 51 insertions(+), 21 deletions(-) > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 660f49db49..575bb68c76 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -530,13 +530,16 @@ config FSL_IMX31 > > config FSL_IMX6 > bool > + imply PCI_DEVICES This should be PCIE_DEVICES. > imply I2C_DEVICES > select A9MPCORE > + select PCI Incorrect, should be PCI_EXPRESS, but this is already (indirectly) selected by PCI_EXPRESS_DESIGNWARE which you select below, so not needed. > select IMX > select IMX_FEC > select IMX_I2C > select IMX_USBPHY > select WDT_IMX2 > + select PCI_EXPRESS_DESIGNWARE > select SDHCI
Hi! Thanks! I'll send a new version of this patch. But what about fsl imx7? Should it also have PCIE_DEVICES? пн, 8 янв. 2024 г. в 15:20, Philippe Mathieu-Daudé <philmd@linaro.org>: > Hi Nikita, > > On 7/1/24 17:57, Nikita Ostrenkov wrote: > > Signed-off-by: Nikita Ostrenkov <n.ostrenkov@gmail.com> > > --- > > hw/arm/Kconfig | 3 +++ > > hw/arm/fsl-imx6.c | 25 ++++++++++++++++++++++ > > include/hw/arm/fsl-imx6.h | 44 ++++++++++++++++++++------------------- > > 3 files changed, 51 insertions(+), 21 deletions(-) > > > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > index 660f49db49..575bb68c76 100644 > > --- a/hw/arm/Kconfig > > +++ b/hw/arm/Kconfig > > @@ -530,13 +530,16 @@ config FSL_IMX31 > > > > config FSL_IMX6 > > bool > > + imply PCI_DEVICES > > This should be PCIE_DEVICES. > > > imply I2C_DEVICES > > select A9MPCORE > > + select PCI > > Incorrect, should be PCI_EXPRESS, but this is already > (indirectly) selected by PCI_EXPRESS_DESIGNWARE which > you select below, so not needed. > > > select IMX > > select IMX_FEC > > select IMX_I2C > > select IMX_USBPHY > > select WDT_IMX2 > > + select PCI_EXPRESS_DESIGNWARE > > select SDHCI >
(+Thomas) On 8/1/24 13:58, Nikita Ostrenkov wrote: > Hi! Thanks! I'll send a new version of this patch. > > But what about fsl imx7? Should it also have PCIE_DEVICES? Yeah I think so, we missed this in commit 02047622b7 ("hw/arm: Express dependencies of the remaining IMX boards with Kconfig"). > > пн, 8 янв. 2024 г. в 15:20, Philippe Mathieu-Daudé <philmd@linaro.org > <mailto:philmd@linaro.org>>: > > Hi Nikita, > > On 7/1/24 17:57, Nikita Ostrenkov wrote: > > Signed-off-by: Nikita Ostrenkov <n.ostrenkov@gmail.com > <mailto:n.ostrenkov@gmail.com>> > > --- > > hw/arm/Kconfig | 3 +++ > > hw/arm/fsl-imx6.c | 25 ++++++++++++++++++++++ > > include/hw/arm/fsl-imx6.h | 44 > ++++++++++++++++++++------------------- > > 3 files changed, 51 insertions(+), 21 deletions(-) > > > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > index 660f49db49..575bb68c76 100644 > > --- a/hw/arm/Kconfig > > +++ b/hw/arm/Kconfig > > @@ -530,13 +530,16 @@ config FSL_IMX31 > > > > config FSL_IMX6 > > bool > > + imply PCI_DEVICES > > This should be PCIE_DEVICES. > > > imply I2C_DEVICES > > select A9MPCORE > > + select PCI > > Incorrect, should be PCI_EXPRESS, but this is already > (indirectly) selected by PCI_EXPRESS_DESIGNWARE which > you select below, so not needed. > > > select IMX > > select IMX_FEC > > select IMX_I2C > > select IMX_USBPHY > > select WDT_IMX2 > > + select PCI_EXPRESS_DESIGNWARE > > select SDHCI >
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 660f49db49..575bb68c76 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -530,13 +530,16 @@ config FSL_IMX31 config FSL_IMX6 bool + imply PCI_DEVICES imply I2C_DEVICES select A9MPCORE + select PCI select IMX select IMX_FEC select IMX_I2C select IMX_USBPHY select WDT_IMX2 + select PCI_EXPRESS_DESIGNWARE select SDHCI config ASPEED_SOC diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index b2153022c0..27702b6d6d 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" +#include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" #include "hw/boards.h" #include "hw/qdev-properties.h" @@ -102,6 +103,8 @@ static void fsl_imx6_init(Object *obj) 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) @@ -109,6 +112,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) MachineState *ms = MACHINE(qdev_get_machine()); FslIMX6State *s = FSL_IMX6(dev); uint16_t i; + qemu_irq irq; unsigned int smp_cpus = ms->smp.cpus; if (smp_cpus > FSL_IMX6_NUM_CPUS) { @@ -421,6 +425,27 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 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 */ if (!memory_region_init_rom(&s->rom, OBJECT(dev), "imx6.rom", FSL_IMX6_ROM_SIZE, errp)) { diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 519b871014..61c593ffd2 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -32,6 +32,7 @@ #include "hw/net/imx_fec.h" #include "hw/usb/chipidea.h" #include "hw/usb/imx-usb-phy.h" +#include "hw/pci-host/designware.h" #include "exec/memory.h" #include "cpu.h" #include "qom/object.h" @@ -55,27 +56,28 @@ struct FslIMX6State { DeviceState parent_obj; /*< public >*/ - ARMCPU cpu[FSL_IMX6_NUM_CPUS]; - A9MPPrivState a9mpcore; - IMX6CCMState ccm; - IMX6SRCState src; - IMX7SNVSState snvs; - IMXSerialState uart[FSL_IMX6_NUM_UARTS]; - IMXGPTState gpt; - IMXEPITState epit[FSL_IMX6_NUM_EPITS]; - IMXI2CState i2c[FSL_IMX6_NUM_I2CS]; - IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS]; - SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; - IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; - IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; - IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS]; - ChipideaState usb[FSL_IMX6_NUM_USBS]; - IMXFECState eth; - MemoryRegion rom; - MemoryRegion caam; - MemoryRegion ocram; - MemoryRegion ocram_alias; - uint32_t phy_num; + ARMCPU cpu[FSL_IMX6_NUM_CPUS]; + A9MPPrivState a9mpcore; + IMX6CCMState ccm; + IMX6SRCState src; + IMX7SNVSState snvs; + IMXSerialState uart[FSL_IMX6_NUM_UARTS]; + IMXGPTState gpt; + IMXEPITState epit[FSL_IMX6_NUM_EPITS]; + IMXI2CState i2c[FSL_IMX6_NUM_I2CS]; + IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS]; + SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; + IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; + IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; + IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS]; + ChipideaState usb[FSL_IMX6_NUM_USBS]; + IMXFECState eth; + DesignwarePCIEHost pcie; + MemoryRegion rom; + MemoryRegion caam; + MemoryRegion ocram; + MemoryRegion ocram_alias; + uint32_t phy_num; };
Signed-off-by: Nikita Ostrenkov <n.ostrenkov@gmail.com> --- hw/arm/Kconfig | 3 +++ hw/arm/fsl-imx6.c | 25 ++++++++++++++++++++++ include/hw/arm/fsl-imx6.h | 44 ++++++++++++++++++++------------------- 3 files changed, 51 insertions(+), 21 deletions(-)