Linux checks for the PLLs in the PHY to be locked, so implement a model
emulating that.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
MAINTAINERS | 2 +
docs/system/arm/imx8mp-evk.rst | 13 +++++
include/hw/arm/fsl-imx8mp.h | 10 ++++
include/hw/pci-host/fsl_imx8m_phy.h | 27 +++++++++
hw/arm/fsl-imx8mp.c | 30 ++++++++++
hw/pci-host/fsl_imx8m_phy.c | 88 +++++++++++++++++++++++++++++
hw/arm/Kconfig | 3 +
hw/pci-host/Kconfig | 3 +
hw/pci-host/meson.build | 1 +
9 files changed, 177 insertions(+)
create mode 100644 include/hw/pci-host/fsl_imx8m_phy.h
create mode 100644 hw/pci-host/fsl_imx8m_phy.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 3c60581fe7..76b416831d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -826,8 +826,10 @@ S: Odd Fixes
F: hw/arm/imx8mp-evk.c
F: hw/arm/fsl-imx8mp.c
F: hw/misc/imx8mp_*.c
+F: hw/pci-host/fsl_imx8m_phy.c
F: include/hw/arm/fsl-imx8mp.h
F: include/hw/misc/imx8mp_*.h
+F: include/hw/pci-host/fsl_imx8m_phy.h
F: docs/system/arm/imx8mp-evk.rst
MPS2 / MPS3
diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst
index 1514bc5864..8d48580cb4 100644
--- a/docs/system/arm/imx8mp-evk.rst
+++ b/docs/system/arm/imx8mp-evk.rst
@@ -14,6 +14,7 @@ The ``imx8mp-evk`` machine implements the following devices:
* Generic Interrupt Controller (GICv3)
* 4 UARTs
* 3 USDHC Storage Controllers
+ * 1 Designware PCI Express Controller
* Secure Non-Volatile Storage (SNVS) including an RTC
* Clock Tree
@@ -62,3 +63,15 @@ Now that everything is prepared the newly built image can be run in the QEMU
-dtb imx8mp-evk-patched.dtb \
-append "root=/dev/mmcblk2p2" \
-drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2
+
+Using PCI Devices
+-----------------
+
+The PCI Express controller spawns two PCI buses, of which only one can be used.
+By default QEMU assigns the wrong bus, so the correct one has to be specified
+manually by adding ``bus=dw-pcie``. For example, when adding an Intel e1000
+network card, the command line looks like:
+
+.. code-block:: bash
+
+ $ qemu-system-aarch64 -M imximp-evk ... -device virtio-net-pci,bus=dw-pcie
diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index 9832c05e8c..bc80a21966 100644
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -14,6 +14,8 @@
#include "hw/intc/arm_gicv3_common.h"
#include "hw/misc/imx7_snvs.h"
#include "hw/misc/imx8mp_ccm.h"
+#include "hw/pci-host/designware.h"
+#include "hw/pci-host/fsl_imx8m_phy.h"
#include "hw/sd/sdhci.h"
#include "qom/object.h"
#include "qemu/units.h"
@@ -41,6 +43,8 @@ struct FslImx8mpState {
IMX7SNVSState snvs;
IMXSerialState uart[FSL_IMX8MP_NUM_UARTS];
SDHCIState usdhc[FSL_IMX8MP_NUM_USDHCS];
+ DesignwarePCIEHost pcie;
+ FslImx8mPciePhyState pcie_phy;
};
enum FslImx8mpMemoryRegions {
@@ -196,6 +200,12 @@ enum FslImx8mpIrqs {
FSL_IMX8MP_UART4_IRQ = 29,
FSL_IMX8MP_UART5_IRQ = 30,
FSL_IMX8MP_UART6_IRQ = 16,
+
+ FSL_IMX8MP_PCI_INTA_IRQ = 126,
+ FSL_IMX8MP_PCI_INTB_IRQ = 125,
+ FSL_IMX8MP_PCI_INTC_IRQ = 124,
+ FSL_IMX8MP_PCI_INTD_IRQ = 123,
+ FSL_IMX8MP_PCI_MSI_IRQ = 140,
};
#endif /* FSL_IMX8MP_H */
diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_imx8m_phy.h
new file mode 100644
index 0000000000..385a904fff
--- /dev/null
+++ b/include/hw/pci-host/fsl_imx8m_phy.h
@@ -0,0 +1,27 @@
+/*
+ * i.MX8 PCIe PHY emulation
+ *
+ * Copyright (c) 2025 Bernhard Beschow <shentey@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef HW_PCIHOST_FSLIMX8MPCIEPHY_H
+#define HW_PCIHOST_FSLIMX8MPCIEPHY_H
+
+#include "hw/sysbus.h"
+#include "qom/object.h"
+#include "exec/memory.h"
+
+#define TYPE_FSL_IMX8M_PCIE_PHY "fsl-imx8m-pcie-phy"
+
+OBJECT_DECLARE_SIMPLE_TYPE(FslImx8mPciePhyState, FSL_IMX8M_PCIE_PHY)
+
+struct FslImx8mPciePhyState {
+ SysBusDevice parent_obj;
+
+ MemoryRegion iomem;
+ uint8_t data[0x800];
+};
+
+#endif
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index 612ea7bf93..d15dcaa9de 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -215,6 +215,10 @@ static void fsl_imx8mp_init(Object *obj)
snprintf(name, NAME_SIZE, "usdhc%d", i + 1);
object_initialize_child(obj, name, &s->usdhc[i], TYPE_IMX_USDHC);
}
+
+ object_initialize_child(obj, "pcie", &s->pcie, TYPE_DESIGNWARE_PCIE_HOST);
+ object_initialize_child(obj, "pcie_phy", &s->pcie_phy,
+ TYPE_FSL_IMX8M_PCIE_PHY);
}
static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
@@ -384,6 +388,30 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->snvs), 0,
fsl_imx8mp_memmap[FSL_IMX8MP_SNVS_HP].addr);
+ /* PCIe */
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->pcie), errp)) {
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->pcie), 0,
+ fsl_imx8mp_memmap[FSL_IMX8MP_PCIE1].addr);
+
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 0,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MP_PCI_INTA_IRQ));
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 1,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MP_PCI_INTB_IRQ));
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 2,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MP_PCI_INTC_IRQ));
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 3,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MP_PCI_INTD_IRQ));
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->pcie), 4,
+ qdev_get_gpio_in(gicdev, FSL_IMX8MP_PCI_MSI_IRQ));
+
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->pcie_phy), errp)) {
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->pcie_phy), 0,
+ fsl_imx8mp_memmap[FSL_IMX8MP_PCIE_PHY1].addr);
+
/* Unimplemented devices */
for (i = 0; i < ARRAY_SIZE(fsl_imx8mp_memmap); i++) {
switch (i) {
@@ -391,6 +419,8 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
case FSL_IMX8MP_CCM:
case FSL_IMX8MP_GIC_DIST:
case FSL_IMX8MP_GIC_REDIST:
+ case FSL_IMX8MP_PCIE1:
+ case FSL_IMX8MP_PCIE_PHY1:
case FSL_IMX8MP_RAM:
case FSL_IMX8MP_SNVS_HP:
case FSL_IMX8MP_UART1 ... FSL_IMX8MP_UART4:
diff --git a/hw/pci-host/fsl_imx8m_phy.c b/hw/pci-host/fsl_imx8m_phy.c
new file mode 100644
index 0000000000..2f70e15c91
--- /dev/null
+++ b/hw/pci-host/fsl_imx8m_phy.c
@@ -0,0 +1,88 @@
+/*
+ * i.MX8 PCIe PHY emulation
+ *
+ * Copyright (c) 2025 Bernhard Beschow <shentey@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "hw/pci-host/fsl_imx8m_phy.h"
+#include "migration/vmstate.h"
+
+#define CMN_REG075 0x1d4
+#define ANA_PLL_LOCK_DONE BIT(1)
+#define ANA_PLL_AFC_DONE BIT(0)
+
+static uint64_t fsl_imx8m_pcie_phy_read(void *opaque, hwaddr offset,
+ unsigned size)
+{
+ FslImx8mPciePhyState *s = opaque;
+
+ if (offset == CMN_REG075) {
+ return s->data[offset] | ANA_PLL_LOCK_DONE | ANA_PLL_AFC_DONE;
+ }
+
+ return s->data[offset];
+}
+
+static void fsl_imx8m_pcie_phy_write(void *opaque, hwaddr offset,
+ uint64_t value, unsigned size)
+{
+ FslImx8mPciePhyState *s = opaque;
+
+ s->data[offset] = value;
+}
+
+static const MemoryRegionOps fsl_imx8m_pcie_phy_ops = {
+ .read = fsl_imx8m_pcie_phy_read,
+ .write = fsl_imx8m_pcie_phy_write,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 8,
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void fsl_imx8m_pcie_phy_realize(DeviceState *dev, Error **errp)
+{
+ FslImx8mPciePhyState *s = FSL_IMX8M_PCIE_PHY(dev);
+
+ memory_region_init_io(&s->iomem, OBJECT(s), &fsl_imx8m_pcie_phy_ops, s,
+ TYPE_FSL_IMX8M_PCIE_PHY, ARRAY_SIZE(s->data));
+ sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
+}
+
+static const VMStateDescription fsl_imx8m_pcie_phy_vmstate = {
+ .name = "fsl-imx8m-pcie-phy",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT8_ARRAY(data, FslImx8mPciePhyState,
+ ARRAY_SIZE(((FslImx8mPciePhyState *)NULL)->data)),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void fsl_imx8m_pcie_phy_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = fsl_imx8m_pcie_phy_realize;
+ dc->vmsd = &fsl_imx8m_pcie_phy_vmstate;
+}
+
+static const TypeInfo fsl_imx8m_pcie_phy_types[] = {
+ {
+ .name = TYPE_FSL_IMX8M_PCIE_PHY,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(FslImx8mPciePhyState),
+ .class_init = fsl_imx8m_pcie_phy_class_init,
+ }
+};
+
+DEFINE_TYPES(fsl_imx8m_pcie_phy_types)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index f880c03d35..f065718416 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -579,9 +579,12 @@ config FSL_IMX7
config FSL_IMX8MP
bool
+ imply PCI_DEVICES
imply TEST_DEVICES
select ARM_GIC
select IMX
+ select PCI_EXPRESS_DESIGNWARE
+ select PCI_EXPRESS_FSL_IMX8M_PHY
select SDHCI
select UNIMP
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index c91880b237..35c0415242 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -99,6 +99,9 @@ config ASTRO
bool
select PCI
+config PCI_EXPRESS_FSL_IMX8M_PHY
+ bool
+
config GT64120
bool
select PCI
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index 3001e93a43..937a0f72ac 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -28,6 +28,7 @@ pci_ss.add(when: 'CONFIG_ARTICIA', if_true: files('articia.c'))
pci_ss.add(when: 'CONFIG_MV64361', if_true: files('mv64361.c'))
# ARM devices
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_FSL_IMX8M_PHY', if_true: files('fsl_imx8m_phy.c'))
pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c'))
# HPPA devices
--
2.48.1On Mon, 20 Jan 2025 at 20:38, Bernhard Beschow <shentey@gmail.com> wrote: > > Linux checks for the PLLs in the PHY to be locked, so implement a model > emulating that. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst > index 1514bc5864..8d48580cb4 100644 > --- a/docs/system/arm/imx8mp-evk.rst > +++ b/docs/system/arm/imx8mp-evk.rst > @@ -14,6 +14,7 @@ The ``imx8mp-evk`` machine implements the following devices: > * Generic Interrupt Controller (GICv3) > * 4 UARTs > * 3 USDHC Storage Controllers > + * 1 Designware PCI Express Controller > * Secure Non-Volatile Storage (SNVS) including an RTC > * Clock Tree > > @@ -62,3 +63,15 @@ Now that everything is prepared the newly built image can be run in the QEMU > -dtb imx8mp-evk-patched.dtb \ > -append "root=/dev/mmcblk2p2" \ > -drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2 > + > +Using PCI Devices > +----------------- > + > +The PCI Express controller spawns two PCI buses, of which only one can be used. > +By default QEMU assigns the wrong bus, so the correct one has to be specified > +manually by adding ``bus=dw-pcie``. For example, when adding an Intel e1000 > +network card, the command line looks like: > + > +.. code-block:: bash > + > + $ qemu-system-aarch64 -M imximp-evk ... -device virtio-net-pci,bus=dw-pcie Why does this happen? Isn't there some way to make QEMU default to using the right bus? Otherwise there's likely to be a lot of user confusion because PCI "doesn't work"... thanks -- PMM
Am 28. Januar 2025 14:33:14 UTC schrieb Peter Maydell <peter.maydell@linaro.org>: >On Mon, 20 Jan 2025 at 20:38, Bernhard Beschow <shentey@gmail.com> wrote: >> >> Linux checks for the PLLs in the PHY to be locked, so implement a model >> emulating that. >> >> Signed-off-by: Bernhard Beschow <shentey@gmail.com> > >> diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst >> index 1514bc5864..8d48580cb4 100644 >> --- a/docs/system/arm/imx8mp-evk.rst >> +++ b/docs/system/arm/imx8mp-evk.rst >> @@ -14,6 +14,7 @@ The ``imx8mp-evk`` machine implements the following devices: >> * Generic Interrupt Controller (GICv3) >> * 4 UARTs >> * 3 USDHC Storage Controllers >> + * 1 Designware PCI Express Controller >> * Secure Non-Volatile Storage (SNVS) including an RTC >> * Clock Tree >> >> @@ -62,3 +63,15 @@ Now that everything is prepared the newly built image can be run in the QEMU >> -dtb imx8mp-evk-patched.dtb \ >> -append "root=/dev/mmcblk2p2" \ >> -drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2 >> + >> +Using PCI Devices >> +----------------- >> + >> +The PCI Express controller spawns two PCI buses, of which only one can be used. >> +By default QEMU assigns the wrong bus, so the correct one has to be specified >> +manually by adding ``bus=dw-pcie``. For example, when adding an Intel e1000 >> +network card, the command line looks like: >> + >> +.. code-block:: bash >> + >> + $ qemu-system-aarch64 -M imximp-evk ... -device virtio-net-pci,bus=dw-pcie > >Why does this happen? Isn't there some way to make QEMU default to >using the right bus? Otherwise there's likely to be a lot of >user confusion because PCI "doesn't work"... Yeah, this is really confusing and I forget about it myself. I'd appreciate any hints here. Best regards, Bernhard > >thanks >-- PMM
On Tue, 28 Jan 2025, Bernhard Beschow wrote: > Am 28. Januar 2025 14:33:14 UTC schrieb Peter Maydell <peter.maydell@linaro.org>: >> On Mon, 20 Jan 2025 at 20:38, Bernhard Beschow <shentey@gmail.com> wrote: >>> >>> Linux checks for the PLLs in the PHY to be locked, so implement a model >>> emulating that. >>> >>> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >> >>> diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst >>> index 1514bc5864..8d48580cb4 100644 >>> --- a/docs/system/arm/imx8mp-evk.rst >>> +++ b/docs/system/arm/imx8mp-evk.rst >>> @@ -14,6 +14,7 @@ The ``imx8mp-evk`` machine implements the following devices: >>> * Generic Interrupt Controller (GICv3) >>> * 4 UARTs >>> * 3 USDHC Storage Controllers >>> + * 1 Designware PCI Express Controller >>> * Secure Non-Volatile Storage (SNVS) including an RTC >>> * Clock Tree >>> >>> @@ -62,3 +63,15 @@ Now that everything is prepared the newly built image can be run in the QEMU >>> -dtb imx8mp-evk-patched.dtb \ >>> -append "root=/dev/mmcblk2p2" \ >>> -drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2 >>> + >>> +Using PCI Devices >>> +----------------- >>> + >>> +The PCI Express controller spawns two PCI buses, of which only one can be used. >>> +By default QEMU assigns the wrong bus, so the correct one has to be specified >>> +manually by adding ``bus=dw-pcie``. For example, when adding an Intel e1000 >>> +network card, the command line looks like: >>> + >>> +.. code-block:: bash >>> + >>> + $ qemu-system-aarch64 -M imximp-evk ... -device virtio-net-pci,bus=dw-pcie >> >> Why does this happen? Isn't there some way to make QEMU default to >> using the right bus? Otherwise there's likely to be a lot of >> user confusion because PCI "doesn't work"... > > Yeah, this is really confusing and I forget about it myself. I'd appreciate any hints here. I'm not sure but I think the PCI bus created last will be used by default so maybe swapping the order these are created may help. Regards, BALATON Zoltan > Best regards, > Bernhard > >> >> thanks >> -- PMM > >
Am 29. Januar 2025 17:54:46 UTC schrieb BALATON Zoltan <balaton@eik.bme.hu>: >On Tue, 28 Jan 2025, Bernhard Beschow wrote: >> Am 28. Januar 2025 14:33:14 UTC schrieb Peter Maydell <peter.maydell@linaro.org>: >>> On Mon, 20 Jan 2025 at 20:38, Bernhard Beschow <shentey@gmail.com> wrote: >>>> >>>> Linux checks for the PLLs in the PHY to be locked, so implement a model >>>> emulating that. >>>> >>>> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >>> >>>> diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst >>>> index 1514bc5864..8d48580cb4 100644 >>>> --- a/docs/system/arm/imx8mp-evk.rst >>>> +++ b/docs/system/arm/imx8mp-evk.rst >>>> @@ -14,6 +14,7 @@ The ``imx8mp-evk`` machine implements the following devices: >>>> * Generic Interrupt Controller (GICv3) >>>> * 4 UARTs >>>> * 3 USDHC Storage Controllers >>>> + * 1 Designware PCI Express Controller >>>> * Secure Non-Volatile Storage (SNVS) including an RTC >>>> * Clock Tree >>>> >>>> @@ -62,3 +63,15 @@ Now that everything is prepared the newly built image can be run in the QEMU >>>> -dtb imx8mp-evk-patched.dtb \ >>>> -append "root=/dev/mmcblk2p2" \ >>>> -drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2 >>>> + >>>> +Using PCI Devices >>>> +----------------- >>>> + >>>> +The PCI Express controller spawns two PCI buses, of which only one can be used. >>>> +By default QEMU assigns the wrong bus, so the correct one has to be specified >>>> +manually by adding ``bus=dw-pcie``. For example, when adding an Intel e1000 >>>> +network card, the command line looks like: >>>> + >>>> +.. code-block:: bash >>>> + >>>> + $ qemu-system-aarch64 -M imximp-evk ... -device virtio-net-pci,bus=dw-pcie >>> >>> Why does this happen? Isn't there some way to make QEMU default to >>> using the right bus? Otherwise there's likely to be a lot of >>> user confusion because PCI "doesn't work"... >> >> Yeah, this is really confusing and I forget about it myself. I'd appreciate any hints here. > >I'm not sure but I think the PCI bus created last will be used by default so maybe swapping the order these are created may help. Turns out there is BusClass::max_dev which is respected when a parent bus for a user-created device is sought. I'll draw inspiration from pnv_phb4. Best regards, Bernhard > >Regards, >BALATON Zoltan > >> Best regards, >> Bernhard >> >>> >>> thanks >>> -- PMM >> >>
© 2016 - 2025 Red Hat, Inc.