Date: Fri, 02 Jan 2026 14:56:07 +0000
From: Bernhard Beschow <shentey@gmail.com>
To: =?UTF-8?Q?Maty=C3=A1=C5=A1_Bobek?= <matyas.bobek@gmail.com>,
 qemu-devel@nongnu.org, Matyas Bobek <bobekmat@fel.cvut.cz>,
 Pavel Pisa <pisa@fel.cvut.cz>
CC: Marc Kleine-Budde <mkl@pengutronix.de>,
 Oliver Hartkopp <socketcan@hartkopp.net>,
 Nikita Ostrenkov <n.ostrenkov@gmail.com>,
 Peter Maydell <peter.maydell@linaro.org>
Subject: Re: [PATCH v1 4/6] hw/arm: Plug FlexCAN into FSL_IMX6 and Sabrelite
In-Reply-To: <e3ce5bc65896f0cca0f641150ad09ddc2480d3e8.1765826753.git.matyas.bobek@gmail.com>
References: <cover.1765826753.git.matyas.bobek@gmail.com>
 <e3ce5bc65896f0cca0f641150ad09ddc2480d3e8.1765826753.git.matyas.bobek@gmail.com>
Message-ID: <F0588357-4A20-4368-8EEE-F14499700718@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=2a00:1450:4864:20::42e;
 envelope-from=shentey@gmail.com; helo=mail-wr1-x42e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org


Am 15=2E Dezember 2025 20:03:13 UTC schrieb "Maty=C3=A1=C5=A1 Bobek" <maty=
as=2Ebobek@gmail=2Ecom>:
>FlexcanState is added to struct FslIMX6State like other peripherals=2E
>
>Add two new machine properties to Sabrelite machine for linking
>the embedded FlexCAN instances to QEMU CAN buses by name=2E
>No other machine uses FslIMX6State=2E
>
>Signed-off-by: Maty=C3=A1=C5=A1 Bobek <matyas=2Ebobek@gmail=2Ecom>
>---
> hw/arm/Kconfig            |  1 +
> hw/arm/fsl-imx6=2Ec         | 29 +++++++++++++++++++++++++++++
> hw/arm/sabrelite=2Ec        | 18 +++++++++++++++++-
> include/hw/arm/fsl-imx6=2Eh |  7 +++++++
> 4 files changed, 54 insertions(+), 1 deletion(-)
>
>diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
>index 7877506384=2E=2E76aa7fee57 100644
>--- a/hw/arm/Kconfig
>+++ b/hw/arm/Kconfig
>@@ -530,6 +530,7 @@ config FSL_IMX6
>     select IMX_FEC
>     select IMX_I2C
>     select IMX_USBPHY
>+    select CAN_FLEXCAN
>     select WDT_IMX2
>     select PL310  # cache controller
>     select PCI_EXPRESS_DESIGNWARE
>diff --git a/hw/arm/fsl-imx6=2Ec b/hw/arm/fsl-imx6=2Ec
>index f3a60022d8=2E=2E19656ba571 100644
>--- a/hw/arm/fsl-imx6=2Ec
>+++ b/hw/arm/fsl-imx6=2Ec
>@@ -97,6 +97,10 @@ static void fsl_imx6_init(Object *obj)
>         snprintf(name, NAME_SIZE, "spi%d", i + 1);
>         object_initialize_child(obj, name, &s->spi[i], TYPE_IMX_SPI);
>     }
>+    for (i =3D 0; i < FSL_IMX6_NUM_CANS; i++) {
>+        snprintf(name, NAME_SIZE, "flexcan%d", i + 1);
>+        object_initialize_child(obj, name, &s->can[i], TYPE_CAN_FLEXCAN)=
;
>+    }
>     for (i =3D 0; i < FSL_IMX6_NUM_WDTS; i++) {
>         snprintf(name, NAME_SIZE, "wdt%d", i);
>         object_initialize_child(obj, name, &s->wdt[i], TYPE_IMX2_WDT);
>@@ -379,6 +383,27 @@ static void fsl_imx6_realize(DeviceState *dev, Error=
 **errp)
>                            qdev_get_gpio_in(gic, spi_table[i]=2Eirq));
>     }
>=20
>+    /* Initialize all FLEXCANs */
>+    for (i =3D 0; i < FSL_IMX6_NUM_CANS; i++) {
>+        static const struct {
>+            hwaddr addr;
>+            unsigned int irq;
>+        } flexcan_table[FSL_IMX6_NUM_CANS] =3D {
>+            { FSL_IMX6_CAN1_ADDR, FSL_IMX6_FLEXCAN1_IRQ },
>+            { FSL_IMX6_CAN2_ADDR, FSL_IMX6_FLEXCAN2_IRQ },
>+        };
>+
>+        s->can[i]=2Eccm =3D IMX_CCM(&s->ccm);
>+        object_property_set_link(OBJECT(&s->can[i]), "canbus",
>+                                 OBJECT(s->canbus[i]), &error_abort);
>+
>+        sysbus_realize(SYS_BUS_DEVICE(&s->can[i]), &error_abort);
>+
>+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->can[i]), 0, flexcan_table[i]=
=2Eaddr);
>+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->can[i]), 0,
>+                           qdev_get_gpio_in(gic, flexcan_table[i]=2Eirq)=
);
>+    }
>+
>     object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num,
>                              &error_abort);
>     qemu_configure_nic_device(DEVICE(&s->eth), true, NULL);
>@@ -482,6 +507,10 @@ static void fsl_imx6_realize(DeviceState *dev, Error=
 **errp)
>=20
> static const Property fsl_imx6_properties[] =3D {
>     DEFINE_PROP_UINT32("fec-phy-num", FslIMX6State, phy_num, 0),
>+    DEFINE_PROP_LINK("canbus0", FslIMX6State, canbus[0], TYPE_CAN_BUS,
>+                     CanBusState *),
>+    DEFINE_PROP_LINK("canbus1", FslIMX6State, canbus[1], TYPE_CAN_BUS,
>+                     CanBusState *),
> };
>=20
> static void fsl_imx6_class_init(ObjectClass *oc, const void *data)
>diff --git a/hw/arm/sabrelite=2Ec b/hw/arm/sabrelite=2Ec
>index 29418af190=2E=2E4bb8fe80d5 100644
>--- a/hw/arm/sabrelite=2Ec
>+++ b/hw/arm/sabrelite=2Ec
>@@ -23,6 +23,7 @@
> typedef struct SabreliteMachineState {
>     MachineState parent_obj;
>     FslIMX6State soc;
>+    CanBusState *canbus[FSL_IMX6_NUM_CANS];
>=20
>     struct arm_boot_info binfo;
> } Sabrelite;
>@@ -65,6 +66,13 @@ static void sabrelite_init(MachineState *machine)
>     /* Ethernet PHY address is 6 */
>     object_property_set_int(OBJECT(&s->soc), "fec-phy-num", 6, &error_fa=
tal);
>=20
>+    for (int i =3D 0; i < FSL_IMX6_NUM_CANS; i++) {
>+        g_autofree char *bus_name =3D g_strdup_printf("canbus%d", i);
>+
>+        object_property_set_link(OBJECT(&s->soc), bus_name,
>+                                 OBJECT(s->canbus[i]), &error_fatal);
>+    }
>+
>     qdev_realize(DEVICE(&s->soc), NULL, &error_fatal);
>=20
>     memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR,
>@@ -118,7 +126,15 @@ static void sabrelite_machine_instance_init(Object *=
obj)
> {
>     Sabrelite *s =3D SABRELITE_MACHINE(obj);
>=20
>-    (void)s;
>+    object_property_add_link(obj, "canbus0", TYPE_CAN_BUS,
>+                             (Object **)&s->canbus[0],
>+                             object_property_allow_set_link,
>+                             0);
>+
>+    object_property_add_link(obj, "canbus1", TYPE_CAN_BUS,
>+                             (Object **)&s->canbus[1],
>+                             object_property_allow_set_link,
>+                             0);
> }
>=20
> static void sabrelite_machine_class_init(ObjectClass *oc, const void *da=
ta)
>diff --git a/include/hw/arm/fsl-imx6=2Eh b/include/hw/arm/fsl-imx6=2Eh
>index 124bbd478f=2E=2E8edbcebe46 100644
>--- a/include/hw/arm/fsl-imx6=2Eh
>+++ b/include/hw/arm/fsl-imx6=2Eh
>@@ -30,11 +30,13 @@
> #include "hw/sd/sdhci=2Eh"
> #include "hw/ssi/imx_spi=2Eh"
> #include "hw/net/imx_fec=2Eh"
>+#include "hw/net/flexcan=2Eh"
> #include "hw/usb/chipidea=2Eh"
> #include "hw/usb/imx-usb-phy=2Eh"
> #include "hw/pci-host/designware=2Eh"
> #include "hw/or-irq=2Eh"
> #include "system/memory=2Eh"
>+#include "net/can_emu=2Eh"
> #include "cpu=2Eh"
> #include "qom/object=2Eh"
>=20
>@@ -51,6 +53,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6State, FSL_IMX6)
> #define FSL_IMX6_NUM_WDTS 2
> #define FSL_IMX6_NUM_USB_PHYS 2
> #define FSL_IMX6_NUM_USBS 4
>+#define FSL_IMX6_NUM_CANS 2
>=20
> struct FslIMX6State {
>     /*< private >*/
>@@ -73,6 +76,7 @@ struct FslIMX6State {
>     IMXUSBPHYState     usbphy[FSL_IMX6_NUM_USB_PHYS];
>     ChipideaState      usb[FSL_IMX6_NUM_USBS];
>     IMXFECState        eth;
>+    FlexcanState       can[FSL_IMX6_NUM_CANS];
>     DesignwarePCIEHost pcie;
>     OrIRQState         pcie4_msi_irq;
>     MemoryRegion       rom;
>@@ -80,6 +84,9 @@ struct FslIMX6State {
>     MemoryRegion       ocram;
>     MemoryRegion       ocram_alias;
>     uint32_t           phy_num;
>+
>+    /* CAN bus=2E */

I'd remove the comment since it merely states the obvious=2E Not a big dea=
l though, so:

Reviewed-by: Bernhard Beschow <shentey@gmail=2Ecom>

>+    CanBusState       *canbus[FSL_IMX6_NUM_CANS];
> };
>=20
>=20