Skip to contentSkip to conversation

Enable multiple MCAN on AM62x

PATCH Superseded Judith Mendez 4 participants 10 messages Apr 19, 2023 – Jun 16, 2023

Subsystems (6)

v1 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

cover Enable multiple MCAN on AM62x

On AM62x there is one MCAN in MAIN domain and two in MCU domain. The MCANs in MCU domain were not enabled since there is no hardware interrupt routed to A53 GIC interrupt controller. Therefore A53 Linux cannot be interrupted by MCU MCANs.

This solution instantiates a hrtimer with 1 ms polling interval for a MCAN when there is no hardware interrupt. This hrtimer generates a recurring software interrupt which allows to call the isr. The isr will check if there is pending transaction by reading a register and proceed normally if there is.

On AM62x this series enables two MCU MCAN which will use the hrtimer implementation. MCANs with hardware interrupt routed to A53 Linux will continue to use the hardware interrupt as expected.

Timer polling method was tested on both classic CAN and CAN-FD at 125 KBPS, 250 KBPS, 1 MBPS and 2.5 MBPS with 4 MBPS bitrate switching.

Letency and CPU load benchmarks were tested on 3x MCAN on AM62x. 1 MBPS timer polling interval is the better timer polling interval since it has comparable latency to hardware interrupt with the worse case being 1ms + CAN frame propagation time and CPU load is not substantial. Latency can be improved further with less than 1 ms polling intervals, howerver it is at the cost of CPU usage since CPU load increases at 0.5 ms and lower polling periods than 1ms.

Note that in terms of power, enabling MCU MCANs with timer-polling implementation might have negative impact since we will have to wake up every 1 ms whether there are CAN packets pending in the RX FIFO or not. This might prevent the CPU from entering into deeper idle states for extended periods of time.

This patch series depends on 'Enable CAN PHY transceiver driver':
https://lore.kernel.org/lkml/[email protected]/T/

Previously sent an RFC:
https://lore.kernel.org/linux-can/[email protected]/T/#t

Judith Mendez (4):
can: m_can: Add hrtimer to generate software interrupt
dt-bindings: net: can: Make interrupt attributes optional for MCAN
arm64: dts: ti: Add AM62x MCAN MAIN domain transceiver overlay
arm64: dts: ti: Enable MCU MCANs for AM62x

 .../bindings/net/can/bosch,m_can.yaml         |  2 -
 arch/arm64/boot/dts/ti/Makefile               |  2 +
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi       | 24 ++++++++
 .../boot/dts/ti/k3-am625-sk-mcan-main.dtso    | 35 ++++++++++++
 .../boot/dts/ti/k3-am625-sk-mcan-mcu.dtso     | 55 +++++++++++++++++++
 drivers/net/can/m_can/m_can.c                 | 30 +++++++++-
 drivers/net/can/m_can/m_can.h                 |  3 +
 drivers/net/can/m_can/m_can_platform.c        | 13 ++++-
 8 files changed, 158 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk-mcan-main.dtso
 create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk-mcan-mcu.dtso
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH 1/4 can: m_can: Add hrtimer to generate software interrupt

Add an hrtimer to MCAN struct. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found.

The hrtimer will generate a software interrupt every 1 ms. In hrtimer callback, we check if there is a transaction pending by reading a register, then process by calling the isr if there is.

---
 drivers/net/can/m_can/m_can.c          | 30 ++++++++++++++++++++++++--
 drivers/net/can/m_can/m_can.h          |  3 +++
 drivers/net/can/m_can/m_can_platform.c | 13 +++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)
drivers/net/can/m_can/m_can.c +28 -2
index a5003435802b..8784bdea300a 100644
@@ -23,6 +23,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/hrtimer.h>
 
 #include "m_can.h"
 
@@ -1587,6 +1588,11 @@ static int m_can_close(struct net_device *dev)
 	if (!cdev->is_peripheral)
 		napi_disable(&cdev->napi);
 
+	if (dev->irq < 0) {
+		dev_dbg(cdev->dev, "Disabling the hrtimer\n");
+		hrtimer_cancel(&cdev->hrtimer);
+	}
+
 	m_can_stop(dev);
 	m_can_clk_stop(cdev);
 	free_irq(dev->irq, dev);
@@ -1793,6 +1799,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
 	return NETDEV_TX_OK;
 }
 
+enum hrtimer_restart hrtimer_callback(struct hrtimer *timer)
+{
+	struct m_can_classdev *cdev =
+		container_of(timer, struct m_can_classdev, hrtimer);
+
+	m_can_isr(0, cdev->net);
+
+	hrtimer_forward_now(timer, ms_to_ktime(1));
+
+	return HRTIMER_RESTART;
+}
+
 static int m_can_open(struct net_device *dev)
 {
 	struct m_can_classdev *cdev = netdev_priv(dev);
@@ -1827,13 +1845,21 @@ static int m_can_open(struct net_device *dev)
 		}
 
 		INIT_WORK(&cdev->tx_work, m_can_tx_work_queue);
-
 		err = request_threaded_irq(dev->irq, NULL, m_can_isr,
 					   IRQF_ONESHOT,
 					   dev->name, dev);
+
 	} else {
-		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
+		if (dev->irq > 0)	{
+			err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
 				  dev);
+		}
+
+		else	{
+			dev_dbg(cdev->dev, "Enabling the hrtimer\n");
+			cdev->hrtimer.function = &hrtimer_callback;
+			hrtimer_start(&cdev->hrtimer, ns_to_ktime(0), HRTIMER_MODE_REL_PINNED);
+		}
 	}
 
 	if (err < 0) {
drivers/net/can/m_can/m_can.h +3 -0
index a839dc71dc9b..ed046d77fdb9 100644
@@ -28,6 +28,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/hrtimer.h>
 
 /* m_can lec values */
 enum m_can_lec_type {
@@ -93,6 +94,8 @@ struct m_can_classdev {
 	int is_peripheral;
 
 	struct mram_cfg mcfg[MRAM_CFG_NUM];
+
+	struct hrtimer hrtimer;
 };
 
 struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv);
drivers/net/can/m_can/m_can_platform.c +11 -2
index 9c1dcf838006..7540db74b7d0 100644
@@ -7,6 +7,7 @@
 
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+#include <linux/hrtimer.h>
 
 #include "m_can.h"
 
@@ -98,8 +99,16 @@ static int m_can_plat_probe(struct platform_device *pdev)
 	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
 	irq = platform_get_irq_byname(pdev, "int0");
 	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
-		goto probe_fail;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}
+		if (IS_ERR(addr)) {
+			ret = PTR_ERR(addr);
+			goto probe_fail;
+		}
+		dev_dbg(mcan_class->dev, "Failed to get irq, initialize hrtimer\n");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
 	}
 
 	/* message ram could be shared */
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

Re: [PATCH 1/4] can: m_can: Add hrtimer to generate software interrupt

Quoted 58 lines · Judith Mendez

Add an hrtimer to MCAN struct. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found.

The hrtimer will generate a software interrupt every 1 ms. In hrtimer callback, we check if there is a transaction pending by reading a register, then process by calling the isr if there is.

---
 drivers/net/can/m_can/m_can.c          | 30 ++++++++++++++++++++++++--
 drivers/net/can/m_can/m_can.h          |  3 +++
 drivers/net/can/m_can/m_can_platform.c | 13 +++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)
drivers/net/can/m_can/m_can.c +18 -0
index a5003435802b..8784bdea300a 100644
@@ -23,6 +23,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/hrtimer.h>
 
 #include "m_can.h"
 
@@ -1587,6 +1588,11 @@ static int m_can_close(struct net_device *dev)
 	if (!cdev->is_peripheral)
 		napi_disable(&cdev->napi);
 
+	if (dev->irq < 0) {
+		dev_dbg(cdev->dev, "Disabling the hrtimer\n");
+		hrtimer_cancel(&cdev->hrtimer);
+	}
+
 	m_can_stop(dev);
 	m_can_clk_stop(cdev);
 	free_irq(dev->irq, dev);
@@ -1793,6 +1799,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
 	return NETDEV_TX_OK;
 }
 
+enum hrtimer_restart hrtimer_callback(struct hrtimer *timer)
+{
+	struct m_can_classdev *cdev =
+		container_of(timer, struct m_can_classdev, hrtimer);
+
+	m_can_isr(0, cdev->net);
+
+	hrtimer_forward_now(timer, ms_to_ktime(1));
+
+	return HRTIMER_RESTART;
+}
+
 static int m_can_open(struct net_device *dev)
 {
 	struct m_can_classdev *cdev = netdev_priv(dev);

drivers/net/can/m_can/m_can.c static int m_can_open(struct net_device *dev) · line 1851

Quoted 8 lines
drivers/net/can/m_can/m_can.c +1 -1
@@ -1827,13 +1845,21 @@ static int m_can_open(struct net_device *dev)
 		}
 
 		INIT_WORK(&cdev->tx_work, m_can_tx_work_queue);
-
 		err = request_threaded_irq(dev->irq, NULL, m_can_isr,
 					   IRQF_ONESHOT,
 					   dev->name, dev);
+

nitpick:
Please remove these 2 newline changes.

drivers/net/can/m_can/m_can.c static int m_can_open(struct net_device *dev) · line 1853

Quoted 3 lines
drivers/net/can/m_can/m_can.c +1 -1
 	} else {
-		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
+		if (dev->irq > 0)	{

Please follow the kernel coding style and use a space not a tab after the closing ")" of the "if".

drivers/net/can/m_can/m_can.c static int m_can_open(struct net_device *dev) · line 1858

Quoted 5 lines
drivers/net/can/m_can/m_can.c +4 -0
+			err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
 				  dev);
+		}
+
+		else	{

Please use kernel coding style: "} else {"

drivers/net/can/m_can/m_can.c static int m_can_open(struct net_device *dev) · line 1862

Quoted 4 lines
drivers/net/can/m_can/m_can.c +4 -0
+			dev_dbg(cdev->dev, "Enabling the hrtimer\n");
+			cdev->hrtimer.function = &hrtimer_callback;
+			hrtimer_start(&cdev->hrtimer, ns_to_ktime(0), HRTIMER_MODE_REL_PINNED);
+		}

I think there's no need to have nested else branches, what about this approach?

drivers/net/can/m_can/m_can.c +3 -1
@@ -1831,9 +1831,11 @@ static int m_can_open(struct net_device *dev)
                 err = request_threaded_irq(dev->irq, NULL, m_can_isr,
                                            IRQF_ONESHOT,
                                            dev->name, dev);
-        } else {
+        } else if (dev->irq) {
                 err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
                                   dev);
+        } else {
+                // polling
         }
 
         if (err < 0) {
Quoted 42 lines
drivers/net/can/m_can/m_can.c +0 -0
 	}
 
 	if (err < 0) {
drivers/net/can/m_can/m_can.h +3 -0
index a839dc71dc9b..ed046d77fdb9 100644
@@ -28,6 +28,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/hrtimer.h>
 
 /* m_can lec values */
 enum m_can_lec_type {
@@ -93,6 +94,8 @@ struct m_can_classdev {
 	int is_peripheral;
 
 	struct mram_cfg mcfg[MRAM_CFG_NUM];
+
+	struct hrtimer hrtimer;
 };
 
 struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv);
drivers/net/can/m_can/m_can_platform.c +1 -2
index 9c1dcf838006..7540db74b7d0 100644
@@ -7,6 +7,7 @@
 
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+#include <linux/hrtimer.h>
 
 #include "m_can.h"
 
@@ -98,8 +99,16 @@ static int m_can_plat_probe(struct platform_device *pdev)
 	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
 	irq = platform_get_irq_byname(pdev, "int0");
 	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
-		goto probe_fail;

drivers/net/can/m_can/m_can_platform.c static int m_can_plat_probe(struct platform_device *pdev) · line 111

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}
+		if (IS_ERR(addr)) {
+			ret = PTR_ERR(addr);
+			goto probe_fail;
+		}
+		dev_dbg(mcan_class->dev, "Failed to get irq, initialize hrtimer\n");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);

Looks better. Please remove the outer "if (IS_ERR(addr) || irq < 0)" and move the error checking directly after "addr = devm_platform_ioremap_resource_byname()".

What do you think about introducing the "poll-interval" property and only enable polling if it is set?

Quoted 7 lines
drivers/net/can/m_can/m_can_platform.c +0 -0
 	}
 
 	/* message ram could be shared */
Signature · 1 line
2.17.1

regards,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

PATCH 2/4 dt-bindings: net: can: Make interrupt attributes optional for MCAN

In reply to Judith Mendez

For MCAN, remove interrupt and interrupt names from the required section.

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by hrtimer. Make interrupt attributes optional in MCAN node by removing from required section.

---
 Documentation/devicetree/bindings/net/can/bosch,m_can.yaml | 2 --
 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +0 -2
index 67879aab623b..43f1aa9addc0 100644
@@ -122,8 +122,6 @@ required:
   - compatible
   - reg
   - reg-names
-  - interrupts
-  - interrupt-names
   - clocks
   - clock-names
   - bosch,mram-cfg
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#4 lore raw

Re: [PATCH 2/4] dt-bindings: net: can: Make interrupt attributes optional for MCAN

Quoted 9 lines · Judith Mendez

For MCAN, remove interrupt and interrupt names from the required section.

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by hrtimer. Make interrupt attributes optional in MCAN node by removing from required section.

This series basically adds polling support to the driver, which is needed due to HW limitations.

The proposed logic in the driver is to use polling if platform_get_irq_byname() fails (due to whatever reason) use polling with a hard-coded interval.

In the kernel I've found the following properties that describe the polling interval:

bindings/input/input.yaml:

|   poll-interval:
|     description: Poll interval time in milliseconds.
|     $ref: /schemas/types.yaml#/definitions/uint32

bindings/thermal/thermal-zones.yaml:

|       polling-delay:
|         $ref: /schemas/types.yaml#/definitions/uint32
|         description:
|           The maximum number of milliseconds to wait between polls when
|           checking this thermal zone. Setting this to 0 disables the polling
|           timers setup by the thermal framework and assumes that the thermal
|           sensors in this zone support interrupts.

bindings/regulator/dlg,da9121.yaml

|   dlg,irq-polling-delay-passive-ms:
|     minimum: 1000
|     maximum: 10000
|     description: |
|       Specify the polling period, measured in milliseconds, between interrupt status
|       update checks. Range 1000-10000 ms.

From my point of view the poll-interval from the input subsystem looks good. Any objections to use it to specify the polling interval for IRQ-less devices, too?

Quoted 21 lines
---
 Documentation/devicetree/bindings/net/can/bosch,m_can.yaml | 2 --
 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +0 -2
index 67879aab623b..43f1aa9addc0 100644
@@ -122,8 +122,6 @@ required:
   - compatible
   - reg
   - reg-names
-  - interrupts
-  - interrupt-names
   - clocks
   - clock-names
   - bosch,mram-cfg
Signature · 1 line
2.17.1

regards,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |
#5 lore raw

Re: [PATCH 2/4] dt-bindings: net: can: Make interrupt attributes optional for MCAN

Quoted 47 lines · Marc Kleine-Budde
Quoted 9 lines · Judith Mendez

For MCAN, remove interrupt and interrupt names from the required section.

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by hrtimer. Make interrupt attributes optional in MCAN node by removing from required section.

This series basically adds polling support to the driver, which is needed due to HW limitations.

The proposed logic in the driver is to use polling if platform_get_irq_byname() fails (due to whatever reason) use polling with a hard-coded interval.

In the kernel I've found the following properties that describe the polling interval:

bindings/input/input.yaml:

|   poll-interval:
|     description: Poll interval time in milliseconds.
|     $ref: /schemas/types.yaml#/definitions/uint32

bindings/thermal/thermal-zones.yaml:

|       polling-delay:
|         $ref: /schemas/types.yaml#/definitions/uint32
|         description:
|           The maximum number of milliseconds to wait between polls when
|           checking this thermal zone. Setting this to 0 disables the polling
|           timers setup by the thermal framework and assumes that the thermal
|           sensors in this zone support interrupts.

bindings/regulator/dlg,da9121.yaml

|   dlg,irq-polling-delay-passive-ms:
|     minimum: 1000
|     maximum: 10000
|     description: |
|       Specify the polling period, measured in milliseconds, between interrupt status
|       update checks. Range 1000-10000 ms.
Quoted 3 lines

From my point of view the poll-interval from the input subsystem looks good. Any objections to use it to specify the polling interval for IRQ-less devices, too?

Better to skip it, if delay can be figured out by driver based on something else (e.g. clocks).

Best regards,
Krzysztof

Acked-by on v1 2/4
#6 lore raw

Re: [PATCH 2/4] dt-bindings: net: can: Make interrupt attributes optional for MCAN

In reply to Judith Mendez
Quoted 10 lines · Judith Mendez

For MCAN, remove interrupt and interrupt names from the required section.

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by hrtimer. Make interrupt attributes optional in MCAN node by removing from required section.

---

Best regards,
Krzysztof

#7 lore raw

PATCH 3/4 DO_NOT_MERGE arm64: dts: ti: Add AM62x MCAN MAIN domain transceiver overlay

In reply to Judith Mendez

Add an overlay for main domain MCAN on AM62x SK. The AM62x SK board does not have on-board CAN transceiver so instead of changing the DTB permanently, add an overlay to enable MAIN domain MCAN and support for 1 CAN transceiver.

---
 arch/arm64/boot/dts/ti/Makefile               |  2 ++
 .../boot/dts/ti/k3-am625-sk-mcan-main.dtso    | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk-mcan-main.dtso
arch/arm64/boot/dts/ti/Makefile +2 -0
index c83c9d772b81..abe15e76b614 100644
@@ -9,8 +9,10 @@
 # alphabetically.
 
 # Boards with AM62x SoC
+k3-am625-sk-mcan-dtbs := k3-am625-sk.dtb k3-am625-sk-mcan-main.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
+dtb-$(CONFIG_ARCH_K3) += k3-am625-sk-mcan.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
 
 # Boards with AM62Ax SoC
arch/arm64/boot/dts/ti/k3-am625-sk-mcan-main.dtso new file +35 -0
new file mode 100644
index 000000000000..72b68fd51121
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
+/**
+ * DT overlay for MCAN transceiver in main domain on AM625 SK
+ *
+ * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/pinctrl/k3.h>
+
+&{/} {
+	transceiver1: can-phy0 {
+		compatible = "ti,tcan1042";
+		#phy-cells = <0>;
+		max-bitrate = <5000000>;
+	};
+};
+
+&main_pmx0 {
+	main_mcan0_pins_default: main-mcan0-pins-default {
+		pinctrl-single,pins = <
+			AM62X_IOPAD(0x1dc, PIN_INPUT, 0) /* (E15) MCAN0_RX */
+			AM62X_IOPAD(0x1d8, PIN_OUTPUT, 0) /* (C15) MCAN0_TX */
+		>;
+	};
+};
+
+&main_mcan0 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_mcan0_pins_default>;
+	phys = <&transceiver1>;
+};
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#8 lore raw

PATCH 4/4 DO_NOT_MERGE arm64: dts: ti: Enable MCU MCANs for AM62x

In reply to Judith Mendez

On AM62x there are no hardware interrupts routed to GIC interrupt controller for MCU MCAN IP, A53 Linux cannot receive hardware interrupts. Since an hrtimer will be used to generate software interrupts, add MCU MCAN nodes to dtsi and default to disabled.

AM62x does not carry on-board CAN transceivers, so instead of changing DTB permanently use an overlay to enable MCU MCANs and to add CAN transceiver nodes.

If an hrtimer is used to generate software interrupts, the two required interrupt attributes in the MCAN node do not have to be included.

---
 arch/arm64/boot/dts/ti/Makefile               |  2 +-
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi       | 24 ++++++++
 .../boot/dts/ti/k3-am625-sk-mcan-mcu.dtso     | 55 +++++++++++++++++++
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk-mcan-mcu.dtso
arch/arm64/boot/dts/ti/Makefile +1 -1
index abe15e76b614..c76be3888e4d 100644
@@ -9,7 +9,7 @@
 # alphabetically.
 
 # Boards with AM62x SoC
-k3-am625-sk-mcan-dtbs := k3-am625-sk.dtb k3-am625-sk-mcan-main.dtbo
+k3-am625-sk-mcan-dtbs := k3-am625-sk.dtb k3-am625-sk-mcan-main.dtbo k3-am625-sk-mcan-mcu.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am625-sk-mcan.dtb
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +24 -0
index 076601a41e84..20462f457643 100644
@@ -141,4 +141,28 @@
 		/* Tightly coupled to M4F */
 		status = "reserved";
 	};
+
+	mcu_mcan1: can@4e00000 {
+		compatible = "bosch,m_can";
+		reg = <0x00 0x4e00000 0x00 0x8000>,
+			  <0x00 0x4e08000 0x00 0x200>;
+		reg-names = "message_ram", "m_can";
+		power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 188 6>, <&k3_clks 188 1>;
+		clock-names = "hclk", "cclk";
+		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+		status = "disabled";
+	};
+
+	mcu_mcan2: can@4e10000 {
+		compatible = "bosch,m_can";
+		reg = <0x00 0x4e10000 0x00 0x8000>,
+			  <0x00 0x4e18000 0x00 0x200>;
+		reg-names = "message_ram", "m_can";
+		power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 189 6>, <&k3_clks 189 1>;
+		clock-names = "hclk", "cclk";
+		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+		status = "disabled";
+	};
 };
arch/arm64/boot/dts/ti/k3-am625-sk-mcan-mcu.dtso new file +55 -0

55 lines not on this page · raw message

Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#9 lore raw

Re: [PATCH 4/4] DO_NOT_MERGE arm64: dts: ti: Enable MCU MCANs for AM62x

Quoted 14 lines · Judith Mendez

On AM62x there are no hardware interrupts routed to GIC interrupt controller for MCU MCAN IP, A53 Linux cannot receive hardware interrupts. Since an hrtimer will be used to generate software interrupts, add MCU MCAN nodes to dtsi and default to disabled.

AM62x does not carry on-board CAN transceivers, so instead of changing DTB permanently use an overlay to enable MCU MCANs and to add CAN transceiver nodes.

If an hrtimer is used to generate software interrupts, the two required interrupt attributes in the MCAN node do not have to be included.

[...]

arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi line 145

Quoted 1 line
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +1 -0
+	mcu_mcan1: can@4e00000 {

this should be mcu_mcan0

Quoted 3 lines
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +3 -0
+		compatible = "bosch,m_can";
+		reg = <0x00 0x4e00000 0x00 0x8000>,
+			  <0x00 0x4e08000 0x00 0x200>;

[...]

arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi line 157

Quoted 1 line
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +1 -0
+	mcu_mcan2: can@4e10000 {

mcu_mcan1

arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi line 160

Quoted 3 lines
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +3 -0
+		compatible = "bosch,m_can";
+		reg = <0x00 0x4e10000 0x00 0x8000>,
+			  <0x00 0x4e18000 0x00 0x200>;

Francesco