hw/net/can: Introduce Xilinx Versal CANFD controller
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/4 MAINTAINERS: Include canfd tests under Xilinx CAN
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -1753,7 +1753,7 @@ M: Francisco Iglesias <[email protected]> S: Maintained F: hw/net/can/xlnx-* F: include/hw/net/xlnx-* -F: tests/qtest/xlnx-can-test* +F: tests/qtest/xlnx-can*-test* EDU M: Jiri Slaby <[email protected]>
Signature · 1 line
2.17.1
PATCH v3 2/4 hw/net/can: Introduce Xilinx Versal CANFD controller
In reply to a message not in the archiveThe Xilinx Versal CANFD controller is developed based on SocketCAN, QEMU CAN bus implementation. Bus connection and socketCAN connection for each CAN module can be set through command lines.
--- hw/net/can/meson.build | 1 + hw/net/can/trace-events | 7 + hw/net/can/xlnx-versal-canfd.c | 2121 ++++++++++++++++++++++++++++ include/hw/net/xlnx-versal-canfd.h | 90 ++ 4 files changed, 2219 insertions(+) create mode 100644 hw/net/can/xlnx-versal-canfd.c create mode 100644 include/hw/net/xlnx-versal-canfd.h
hw/net/can/meson.build +1 -0
@@ -5,3 +5,4 @@ softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c')) softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD', if_true: files('ctucan_core.c')) softmmu_ss.add(when: 'CONFIG_CAN_CTUCANFD_PCI', if_true: files('ctucan_pci.c')) softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-can.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-canfd.c'))
hw/net/can/trace-events +7 -0
@@ -7,3 +7,10 @@ xlnx_can_filter_mask_pre_write(uint8_t filter_num, uint32_t value) "Filter%d MAS xlnx_can_tx_data(uint32_t id, uint8_t dlc, uint8_t db0, uint8_t db1, uint8_t db2, uint8_t db3, uint8_t db4, uint8_t db5, uint8_t db6, uint8_t db7) "Frame: ID: 0x%08x DLC: 0x%02x DATA: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x" xlnx_can_rx_data(uint32_t id, uint32_t dlc, uint8_t db0, uint8_t db1, uint8_t db2, uint8_t db3, uint8_t db4, uint8_t db5, uint8_t db6, uint8_t db7) "Frame: ID: 0x%08x DLC: 0x%02x DATA: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x" xlnx_can_rx_discard(uint32_t status) "Controller is not enabled for bus communication. Status Register: 0x%08x" + +# xlnx-versal-canfd.c +xlnx_canfd_update_irq(char *path, uint32_t isr, uint32_t ier, uint32_t irq) "%s: ISR: 0x%08x IER: 0x%08x IRQ: 0x%08x" +xlnx_canfd_rx_fifo_filter_reject(char *path, uint32_t id, uint8_t dlc) "%s: Frame: ID: 0x%08x DLC: 0x%02x" +xlnx_canfd_rx_data(char *path, uint32_t id, uint8_t dlc, uint8_t flags) "%s: Frame: ID: 0x%08x DLC: 0x%02x CANFD Flag: 0x%02x" +xlnx_canfd_tx_data(char *path, uint32_t id, uint8_t dlc, uint8_t flgas) "%s: Frame: ID: 0x%08x DLC: 0x%02x CANFD Flag: 0x%02x" +xlnx_canfd_reset(char *path, uint32_t val) "%s: Resetting controller with value = 0x%08x"
hw/net/can/xlnx-versal-canfd.c new file +2121 -0
2,121 lines not on this page · raw message
include/hw/net/xlnx-versal-canfd.h new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 3/4 xlnx-zynqmp: Connect Xilinx VERSAL CANFD controllers
In reply to a message not in the archiveConnect CANFD0 and CANFD1 on the Versal-virt machine and update xlnx-versal-virt document with CANFD command line examples.
--- docs/system/arm/xlnx-versal-virt.rst | 31 ++++++++++++++++++ hw/arm/xlnx-versal-virt.c | 48 ++++++++++++++++++++++++++++ hw/arm/xlnx-versal.c | 37 +++++++++++++++++++++ include/hw/arm/xlnx-versal.h | 12 +++++++ 4 files changed, 128 insertions(+)
docs/system/arm/xlnx-versal-virt.rst +31 -0
@@ -34,6 +34,7 @@ Implemented devices: - DDR memory - BBRAM (36 bytes of Battery-backed RAM) - eFUSE (3072 bytes of one-time field-programmable bit array) +- 2 CANFDs QEMU does not yet model any other devices, including the PL and the AI Engine.
@@ -224,3 +225,33 @@ To use a different index value, N, from default of 1, add: Better yet, do not use actual product data when running guest image on this Xilinx Versal Virt board. + +Using CANFDs for Versal Virt +"""""""""""""""""""""""""""" +Versal CANFD controller is developed based on SocketCAN and QEMU CAN bus +implementation. Bus connection and socketCAN connection for each CAN module +can be set through command lines. + +To connect both CANFD0 and CANFD1 on the same bus: + +.. code-block:: bash + + -object can-bus,id=canbus -machine canbus0=canbus -machine canbus1=canbus + +To connect CANFD0 and CANFD1 to separate buses: + +.. code-block:: bash + + -object can-bus,id=canbus0 -object can-bus,id=canbus1 \ + -machine canbus0=canbus0 -machine canbus1=canbus1 + +SocketCAN interface can connect to a Physical or a Virtual CAN interfaces on +host machine. Please check this document to learn about CAN interface on Linux: +docs/system/devices/can.rst + +To connect CANFD0 and CANFD1 to host machine's CAN interface can0: + +.. code-block:: bash + + -object can-bus,id=canbus -machine canbus0=canbus -machine canbus1=canbus + -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus
hw/arm/xlnx-versal-virt.c +48 -0
81 lines not on this page · raw message
hw/arm/xlnx-versal.c +37 -0
@@ -185,6 +185,38 @@ static void versal_create_uarts(Versal *s, qemu_irq *pic) } } +static void versal_create_canfds (Versal *s,qemu_irq *pic) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (s->lpd.iou.canfd); i++) { +static const int irqs[] = {VERSAL_CANFD0_IRQ_0 ,VERSAL_CANFD1_IRQ_0 }; +static const uint64_t addrs[] = {MM_CANFD0 ,MM_CANFD1 }; +char *name =g_strdup_printf ("canfd%d" , i); +SysBusDevice *sbd; +MemoryRegion *mr; + +object_initialize_child (OBJECT (s), name, &s->lpd.iou.canfd[i], +TYPE_XILINX_CANFD ); + sbd =SYS_BUS_DEVICE (&s->lpd.iou.canfd[i]); + +object_property_set_int (OBJECT (&s->lpd.iou.canfd[i]),"ext_clk_freq" , +XLNX_VERSAL_CANFD_REF_CLK , &error_abort); + +object_property_set_link (OBJECT (&s->lpd.iou.canfd[i]),"canfdbus" , +OBJECT (s->lpd.iou.canbus[i]), + &error_abort); + +sysbus_realize (sbd, &error_fatal); + + mr =sysbus_mmio_get_region (sbd,0 ); +memory_region_add_subregion (&s->mr_ps, addrs[i], mr); + +sysbus_connect_irq (sbd,0 , pic[irqs[i]]); +g_free (name); + } +} +static void versal_create_usbs (Versal *s,qemu_irq *pic) {DeviceState *dev;
@@ -719,6 +751,7 @@ static void versal_realize(DeviceState *dev, Error **errp)versal_create_apu_gic (s, pic);versal_create_rpu_cpus (s);versal_create_uarts (s, pic); +versal_create_canfds (s, pic);versal_create_usbs (s, pic);versal_create_gems (s, pic);versal_create_admas (s, pic);
@@ -758,6 +791,10 @@ static void versal_init(Object *obj)static Property versal_properties[] = {DEFINE_PROP_LINK ("ddr" , Versal, cfg.mr_ddr,TYPE_MEMORY_REGION , MemoryRegion *), +DEFINE_PROP_LINK ("canbus0" , Versal, lpd.iou.canbus[0 ], + TYPE_CAN_BUS, CanBusState *), +DEFINE_PROP_LINK ("canbus1" , Versal, lpd.iou.canbus[1 ], + TYPE_CAN_BUS, CanBusState *),DEFINE_PROP_END_OF_LIST () };
include/hw/arm/xlnx-versal.h +12 -0
@@ -31,6 +31,7 @@#include "hw/dma/xlnx_csu_dma.h" #include "hw/misc/xlnx-versal-crl.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" +#include "hw/net/xlnx-versal-canfd.h" #define TYPE_XLNX_VERSAL "xlnx-versal"OBJECT_DECLARE_SIMPLE_TYPE (Versal,XLNX_VERSAL )
@@ -43,6 +44,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL)#define XLNX_VERSAL_NR_SDS 2#define XLNX_VERSAL_NR_XRAM 4#define XLNX_VERSAL_NR_IRQS 192 +#define XLNX_VERSAL_NR_CANFD 2 +#define XLNX_VERSAL_CANFD_REF_CLK (24 * 1000 * 1000)struct Versal {/*< private >*/
@@ -73,6 +76,8 @@ struct Versal {CadenceGEMState gem[XLNX_VERSAL_NR_GEMS ];XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS ];VersalUsb2 usb; +CanBusState *canbus[XLNX_VERSAL_NR_CANFD ]; +XlnxVersalCANFDState canfd[XLNX_VERSAL_NR_CANFD ]; } iou;/* Real-time Processing Unit. */
@@ -133,6 +138,8 @@ struct Versal {#define VERSAL_CRL_IRQ 10#define VERSAL_UART0_IRQ_0 18#define VERSAL_UART1_IRQ_0 19 +#define VERSAL_CANFD0_IRQ_0 20 +#define VERSAL_CANFD1_IRQ_0 21#define VERSAL_USB0_IRQ_0 22#define VERSAL_GEM0_IRQ_0 56#define VERSAL_GEM0_WAKE_IRQ_0 57
@@ -163,6 +170,11 @@ struct Versal {#define MM_UART1 0xff010000U#define MM_UART1_SIZE 0x10000 +#define MM_CANFD0 0xff060000 +#define MM_CANFD0_SIZE 0x10000 +#define MM_CANFD1 0xff070000 +#define MM_CANFD1_SIZE 0x10000 +#define MM_GEM0 0xff0c0000U#define MM_GEM0_SIZE 0x10000#define MM_GEM1 0xff0d0000U
Signature · 1 line
2.17.1
PATCH v3 3/4 xlnx-versal: Connect Xilinx VERSAL CANFD controllers
In reply to a message not in the archiveConnect CANFD0 and CANFD1 on the Versal-virt machine and update xlnx-versal-virt document with CANFD command line examples.
--- docs/system/arm/xlnx-versal-virt.rst | 31 ++++++++++++++++++ hw/arm/xlnx-versal-virt.c | 48 ++++++++++++++++++++++++++++ hw/arm/xlnx-versal.c | 37 +++++++++++++++++++++ include/hw/arm/xlnx-versal.h | 12 +++++++ 4 files changed, 128 insertions(+)
docs/system/arm/xlnx-versal-virt.rst +31 -0
@@ -34,6 +34,7 @@ Implemented devices: - DDR memory - BBRAM (36 bytes of Battery-backed RAM) - eFUSE (3072 bytes of one-time field-programmable bit array) +- 2 CANFDs QEMU does not yet model any other devices, including the PL and the AI Engine.
@@ -224,3 +225,33 @@ To use a different index value, N, from default of 1, add: Better yet, do not use actual product data when running guest image on this Xilinx Versal Virt board. + +Using CANFDs for Versal Virt +"""""""""""""""""""""""""""" +Versal CANFD controller is developed based on SocketCAN and QEMU CAN bus +implementation. Bus connection and socketCAN connection for each CAN module +can be set through command lines. + +To connect both CANFD0 and CANFD1 on the same bus: + +.. code-block:: bash + + -object can-bus,id=canbus -machine canbus0=canbus -machine canbus1=canbus + +To connect CANFD0 and CANFD1 to separate buses: + +.. code-block:: bash + + -object can-bus,id=canbus0 -object can-bus,id=canbus1 \ + -machine canbus0=canbus0 -machine canbus1=canbus1 + +The SocketCAN interface can connect to a Physical or a Virtual CAN interfaces on +the host machine. Please check this document to learn about CAN interface on +Linux: docs/system/devices/can.rst + +To connect CANFD0 and CANFD1 to host machine's CAN interface can0: + +.. code-block:: bash + + -object can-bus,id=canbus -machine canbus0=canbus -machine canbus1=canbus + -object can-host-socketcan,id=canhost0,if=can0,canbus=canbus
hw/arm/xlnx-versal-virt.c +48 -0
81 lines not on this page · raw message
hw/arm/xlnx-versal.c +37 -0
@@ -185,6 +185,38 @@ static void versal_create_uarts(Versal *s, qemu_irq *pic) } } +static void versal_create_canfds (Versal *s,qemu_irq *pic) +{ +int i; +uint32_t irqs[] = {VERSAL_CANFD0_IRQ_0 ,VERSAL_CANFD1_IRQ_0 }; +uint64_t addrs[] = {MM_CANFD0 ,MM_CANFD1 }; + +for (i =0 ; i <ARRAY_SIZE (s->lpd.iou.canfd); i++) { +char *name =g_strdup_printf ("canfd%d" , i); +SysBusDevice *sbd; +MemoryRegion *mr; + +object_initialize_child (OBJECT (s), name, &s->lpd.iou.canfd[i], +TYPE_XILINX_CANFD ); + sbd =SYS_BUS_DEVICE (&s->lpd.iou.canfd[i]); + +object_property_set_int (OBJECT (&s->lpd.iou.canfd[i]),"ext_clk_freq" , +XLNX_VERSAL_CANFD_REF_CLK , &error_abort); + +object_property_set_link (OBJECT (&s->lpd.iou.canfd[i]),"canfdbus" , +OBJECT (s->lpd.iou.canbus[i]), + &error_abort); + +sysbus_realize (sbd, &error_fatal); + + mr =sysbus_mmio_get_region (sbd,0 ); +memory_region_add_subregion (&s->mr_ps, addrs[i], mr); + +sysbus_connect_irq (sbd,0 , pic[irqs[i]]); +g_free (name); + } +} +static void versal_create_usbs (Versal *s,qemu_irq *pic) {DeviceState *dev;
@@ -719,6 +751,7 @@ static void versal_realize(DeviceState *dev, Error **errp)versal_create_apu_gic (s, pic);versal_create_rpu_cpus (s);versal_create_uarts (s, pic); +versal_create_canfds (s, pic);versal_create_usbs (s, pic);versal_create_gems (s, pic);versal_create_admas (s, pic);
@@ -758,6 +791,10 @@ static void versal_init(Object *obj)static Property versal_properties[] = {DEFINE_PROP_LINK ("ddr" , Versal, cfg.mr_ddr,TYPE_MEMORY_REGION , MemoryRegion *), +DEFINE_PROP_LINK ("canbus0" , Versal, lpd.iou.canbus[0 ], + TYPE_CAN_BUS, CanBusState *), +DEFINE_PROP_LINK ("canbus1" , Versal, lpd.iou.canbus[1 ], + TYPE_CAN_BUS, CanBusState *),DEFINE_PROP_END_OF_LIST () };
include/hw/arm/xlnx-versal.h +12 -0
@@ -31,6 +31,7 @@#include "hw/dma/xlnx_csu_dma.h" #include "hw/misc/xlnx-versal-crl.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" +#include "hw/net/xlnx-versal-canfd.h" #define TYPE_XLNX_VERSAL "xlnx-versal"OBJECT_DECLARE_SIMPLE_TYPE (Versal,XLNX_VERSAL )
@@ -43,6 +44,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL)#define XLNX_VERSAL_NR_SDS 2#define XLNX_VERSAL_NR_XRAM 4#define XLNX_VERSAL_NR_IRQS 192 +#define XLNX_VERSAL_NR_CANFD 2 +#define XLNX_VERSAL_CANFD_REF_CLK (24 * 1000 * 1000)struct Versal {/*< private >*/
@@ -73,6 +76,8 @@ struct Versal {CadenceGEMState gem[XLNX_VERSAL_NR_GEMS ];XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS ];VersalUsb2 usb; +CanBusState *canbus[XLNX_VERSAL_NR_CANFD ]; +XlnxVersalCANFDState canfd[XLNX_VERSAL_NR_CANFD ]; } iou;/* Real-time Processing Unit. */
@@ -133,6 +138,8 @@ struct Versal {#define VERSAL_CRL_IRQ 10#define VERSAL_UART0_IRQ_0 18#define VERSAL_UART1_IRQ_0 19 +#define VERSAL_CANFD0_IRQ_0 20 +#define VERSAL_CANFD1_IRQ_0 21#define VERSAL_USB0_IRQ_0 22#define VERSAL_GEM0_IRQ_0 56#define VERSAL_GEM0_WAKE_IRQ_0 57
@@ -163,6 +170,11 @@ struct Versal {#define MM_UART1 0xff010000U#define MM_UART1_SIZE 0x10000 +#define MM_CANFD0 0xff060000 +#define MM_CANFD0_SIZE 0x10000 +#define MM_CANFD1 0xff070000 +#define MM_CANFD1_SIZE 0x10000 +#define MM_GEM0 0xff0c0000U#define MM_GEM0_SIZE 0x10000#define MM_GEM1 0xff0d0000U
Signature · 1 line
2.17.1
PATCH v3 4/4 tests/qtest: Introduce tests for Xilinx VERSAL CANFD controller
In reply to a message not in the archiveThe QTests perform three tests on the Xilinx VERSAL CANFD controller:
Tests the CANFD controllers in loopback.
Tests the CANFD controllers in normal mode with CAN frame. Tests the CANFD controllers in normal mode with CANFD frame.
--- tests/qtest/meson.build | 1 + tests/qtest/xlnx-canfd-test.c | 422 ++++++++++++++++++++++++++++++++++ 2 files changed, 423 insertions(+) create mode 100644 tests/qtest/xlnx-canfd-test.c
tests/qtest/meson.build +1 -0
@@ -213,6 +213,7 @@ qtests_aarch64 = \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ + (config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test'] : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',
tests/qtest/xlnx-canfd-test.c new file +422 -0
422 lines not on this page · raw message
Signature · 1 line
2.17.1