Skip to contentSkip to conversation

Enable multiple MCAN on AM62x

PATCH Superseded Judith Mendez 4 participants 9 messages May 23, 2023 – May 25, 2023

Subsystems (5)

v7 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

v7 cover Enable multiple MCAN on AM62x

On AM62x there are two MCANs 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 MCAN device when there is no hardware interrupt property in DTB MCAN node. The 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. 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.

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.

v6:

v5:

v4:

v2:

V1:

RFC:

v6:
- Clean up m_can_platform.c after removing poll-interval

v6:
- Move hrtimer stop/start function calls to m_can_open and m_can_close to support power suspend/resume

v5:
- Remove poll-interval in bindings
- Change dev_dbg to dev_info if hardware int exists and polling is enabled

v4:
- Wrong patches sent

v3:
- Update binding poll-interval description
- Add oneOf to select either interrupts/interrupt-names or poll-interval
- Create a define for 1 ms polling interval
- Change plarform_get_irq to optional to not print error msg

v2:
- Add poll-interval property to bindings and MCAN DTB node
- Add functionality to check for 'poll-interval' property in MCAN node
- Bindings: add an example using poll-interval
- Add 'polling' flag in driver to check if device is using polling method
- Check for timer polling and hardware interrupt cases, default to hardware interrupt method
- Change ns_to_ktime() to ms_to_ktime()

Judith Mendez (2):
dt-bindings: net: can: Remove interrupt properties for MCAN
can: m_can: Add hrtimer to generate software interrupt

 .../bindings/net/can/bosch,m_can.yaml         | 20 +++++++++--
 drivers/net/can/m_can/m_can.c                 | 33 +++++++++++++++++--
 drivers/net/can/m_can/m_can.h                 |  4 +++
 drivers/net/can/m_can/m_can_platform.c        | 25 ++++++++++++--
 4 files changed, 75 insertions(+), 7 deletions(-)

base-commit: 9f258af06b6268be8e960f63c3f66e88bdbbbdb0

Signature · 1 line
2.17.1
#1 lore raw

PATCH v7 1/2 dt-bindings: net: can: Remove interrupt properties for MCAN

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by timer polling.

To enable timer polling method, interrupts should be optional so remove interrupts property from required section and add an example for MCAN node with timer polling enabled.

---
Changelog:
v7:
1. No changes
v6:
1. No changes
v5:
1. Remove poll-interval
2. Remove oneOf that selects interrupts/interrupt-names or poll-interval
v3:
1. Update binding poll-interval description
2. Add oneOf to select interrupts/interrupt-names or poll-interval
v2:
1. Add poll-interval property to enable timer polling method
2. Add example using poll-interval property

---
 .../bindings/net/can/bosch,m_can.yaml         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +18 -2
index 67879aab623b..bb518c831f7b 100644
@@ -122,8 +122,6 @@ required:
   - compatible
   - reg
   - reg-names
-  - interrupts
-  - interrupt-names
   - clocks
   - clock-names
   - bosch,mram-cfg
@@ -132,6 +130,7 @@ additionalProperties: false
 
 examples:
   - |
+    // Example with interrupts
     #include <dt-bindings/clock/imx6sx-clock.h>
     can@20e8000 {
       compatible = "bosch,m_can";
@@ -149,4 +148,21 @@ examples:
       };
     };
 
+  - |
+    // Example with timer polling
+    #include <dt-bindings/clock/imx6sx-clock.h>
+    can@20e8000 {
+      compatible = "bosch,m_can";
+      reg = <0x020e8000 0x4000>, <0x02298000 0x4000>;
+      reg-names = "m_can", "message_ram";
+      clocks = <&clks IMX6SX_CLK_CANFD>,
+               <&clks IMX6SX_CLK_CANFD>;
+      clock-names = "hclk", "cclk";
+      bosch,mram-cfg = <0x0 0 0 32 0 0 0 1>;
+
+      can-transceiver {
+        max-bitrate = <5000000>;
+      };
+    };
+
 ...
Signature · 1 line
2.17.1
Reviewed-by on v7 1/2
#2 lore raw

Re: [PATCH v7 1/2] dt-bindings: net: can: Remove interrupt properties for MCAN

Quoted 9 lines · Judith Mendez

On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by timer polling.

To enable timer polling method, interrupts should be optional so remove interrupts property from required section and add an example for MCAN node with timer polling enabled.

Thanks,
Conor.

#3 lore raw

PATCH v7 2/2 can: m_can: Add hrtimer to generate software interrupt

In reply to Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

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.

---
Changelog:
v7:
- Clean up m_can_platform.c if/else section after removing poll-interval
- Remove poll-interval from patch description
v6:
- Move hrtimer stop/start function calls to m_can_open and m_can_close to support power suspend/resume
v5:
- Change dev_dbg to dev_info if hardware interrupt exists and polling is enabled
v4:
- No changes
v3:
- Create a define for 1 ms polling interval
- Change plarform_get_irq to optional to not print error msg v2:
- Add functionality to check for 'poll-interval' property in MCAN node
- Add 'polling' flag in driver to check if device is using polling method
- Check for timer polling and hardware interrupt cases, default to hardware interrupt method
- Change ns_to_ktime() to ms_to_ktime()

---
 drivers/net/can/m_can/m_can.c          | 33 ++++++++++++++++++++++++--
 drivers/net/can/m_can/m_can.h          |  4 ++++
 drivers/net/can/m_can/m_can_platform.c | 25 ++++++++++++++++---
 3 files changed, 57 insertions(+), 5 deletions(-)
drivers/net/can/m_can/m_can.c +31 -2
index a5003435802b..f273d989bdff 100644
@@ -11,6 +11,7 @@
 #include <linux/bitfield.h>
 #include <linux/can/dev.h>
 #include <linux/ethtool.h>
+#include <linux/hrtimer.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -308,6 +309,9 @@ enum m_can_reg {
 #define TX_EVENT_MM_MASK	GENMASK(31, 24)
 #define TX_EVENT_TXTS_MASK	GENMASK(15, 0)
 
+/* Hrtimer polling interval */
+#define HRTIMER_POLL_INTERVAL		1
+
 /* The ID and DLC registers are adjacent in M_CAN FIFO memory,
  * and we can save a (potentially slow) bus round trip by combining
  * reads and writes to them.
@@ -895,7 +899,7 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
 			netdev_dbg(dev, "Arbitration phase error detected\n");
 			work_done += m_can_handle_lec_err(dev, lec);
 		}
-		
+
 		if (is_lec_err(dlec)) {
 			netdev_dbg(dev, "Data phase error detected\n");
 			work_done += m_can_handle_lec_err(dev, dlec);
@@ -1414,6 +1418,12 @@ static int m_can_start(struct net_device *dev)
 
 	m_can_enable_all_interrupts(cdev);
 
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Start hrtimer\n");
+		hrtimer_start(&cdev->hrtimer, ms_to_ktime(HRTIMER_POLL_INTERVAL),
+			      HRTIMER_MODE_REL_PINNED);
+	}
+
 	return 0;
 }
 
@@ -1571,6 +1581,11 @@ static void m_can_stop(struct net_device *dev)
 	/* disable all interrupts */
 	m_can_disable_all_interrupts(cdev);
 
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Disabling the hrtimer\n");
+		hrtimer_cancel(&cdev->hrtimer);
+	}
+
 	/* Set init mode to disengage from the network */
 	m_can_config_endisable(cdev, true);
 
@@ -1793,6 +1808,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
 	return NETDEV_TX_OK;
 }
 
+static 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(HRTIMER_POLL_INTERVAL));
+
+	return HRTIMER_RESTART;
+}
+
 static int m_can_open(struct net_device *dev)
 {
 	struct m_can_classdev *cdev = netdev_priv(dev);
@@ -1831,9 +1858,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 (!cdev->polling) {
 		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
 				  dev);
+	} else {
+		cdev->hrtimer.function = &hrtimer_callback;
 	}
 
 	if (err < 0) {
drivers/net/can/m_can/m_can.h +4 -0
index a839dc71dc9b..e9db5cce4e68 100644
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/freezer.h>
+#include <linux/hrtimer.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -93,6 +94,9 @@ struct m_can_classdev {
 	int is_peripheral;
 
 	struct mram_cfg mcfg[MRAM_CFG_NUM];
+
+	struct hrtimer hrtimer;
+	bool polling;
 };
 
 struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv);
drivers/net/can/m_can/m_can_platform.c +22 -3
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
 //
 // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
+#include <linux/hrtimer.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
 		goto probe_fail;
 
 	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
 		goto probe_fail;
 	}
 
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}
+		if (irq < 0) {
+			ret = -ENXIO;
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}
+
 	/* message ram could be shared */
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
 	if (!res) {
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH v7 2/2] can: m_can: Add hrtimer to generate software interrupt

Quoted 3 lines · Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

Please add a sentence why you introduce polling mode, i.e. there are SoCs where the M_CAN interrupt is not available on the CPUs (which are running Linux).

Quoted 56 lines

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.

---
Changelog:
v7:
- Clean up m_can_platform.c if/else section after removing poll-interval
- Remove poll-interval from patch description
v6:
- Move hrtimer stop/start function calls to m_can_open and m_can_close to support power suspend/resume
v5:
- Change dev_dbg to dev_info if hardware interrupt exists and polling is enabled
v4:
- No changes
v3:
- Create a define for 1 ms polling interval
- Change plarform_get_irq to optional to not print error msg v2:
- Add functionality to check for 'poll-interval' property in MCAN node
- Add 'polling' flag in driver to check if device is using polling method
- Check for timer polling and hardware interrupt cases, default to hardware interrupt method
- Change ns_to_ktime() to ms_to_ktime()

---
 drivers/net/can/m_can/m_can.c          | 33 ++++++++++++++++++++++++--
 drivers/net/can/m_can/m_can.h          |  4 ++++
 drivers/net/can/m_can/m_can_platform.c | 25 ++++++++++++++++---
 3 files changed, 57 insertions(+), 5 deletions(-)
drivers/net/can/m_can/m_can.c +4 -0
index a5003435802b..f273d989bdff 100644
@@ -11,6 +11,7 @@
 #include <linux/bitfield.h>
 #include <linux/can/dev.h>
 #include <linux/ethtool.h>
+#include <linux/hrtimer.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -308,6 +309,9 @@ enum m_can_reg {
 #define TX_EVENT_MM_MASK	GENMASK(31, 24)
 #define TX_EVENT_TXTS_MASK	GENMASK(15, 0)
 
+/* Hrtimer polling interval */
+#define HRTIMER_POLL_INTERVAL		1
+
 /* The ID and DLC registers are adjacent in M_CAN FIFO memory,
  * and we can save a (potentially slow) bus round trip by combining
  * reads and writes to them.

drivers/net/can/m_can/m_can.c static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, · line 902

Quoted 5 lines
drivers/net/can/m_can/m_can.c +1 -1
@@ -895,7 +899,7 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
 			netdev_dbg(dev, "Arbitration phase error detected\n");
 			work_done += m_can_handle_lec_err(dev, lec);
 		}
-		
+

Unrelated change. I've send a separate patch to fix the problem.

Quoted 17 lines
drivers/net/can/m_can/m_can.c +6 -0
 		if (is_lec_err(dlec)) {
 			netdev_dbg(dev, "Data phase error detected\n");
 			work_done += m_can_handle_lec_err(dev, dlec);
@@ -1414,6 +1418,12 @@ static int m_can_start(struct net_device *dev)
 
 	m_can_enable_all_interrupts(cdev);
 
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Start hrtimer\n");
+		hrtimer_start(&cdev->hrtimer, ms_to_ktime(HRTIMER_POLL_INTERVAL),
+			      HRTIMER_MODE_REL_PINNED);
+	}
+
 	return 0;
 }
 

drivers/net/can/m_can/m_can.c static void m_can_stop(struct net_device *dev) · line 1588

Quoted 8 lines
drivers/net/can/m_can/m_can.c +5 -0
@@ -1571,6 +1581,11 @@ static void m_can_stop(struct net_device *dev)
 	/* disable all interrupts */
 	m_can_disable_all_interrupts(cdev);
 
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Disabling the hrtimer\n");
+		hrtimer_cancel(&cdev->hrtimer);
+	}
+

This might be a racy. Please move the disabling of the hrtimer before disabling all interrupts. This makes it also symmetric with respect to m_can_start().

Quoted 23 lines
drivers/net/can/m_can/m_can.c +12 -0
 	/* Set init mode to disengage from the network */
 	m_can_config_endisable(cdev, true);
 
@@ -1793,6 +1808,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
 	return NETDEV_TX_OK;
 }
 
+static 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(HRTIMER_POLL_INTERVAL));
+
+	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 1865

Quoted 9 lines
drivers/net/can/m_can/m_can.c +3 -1
@@ -1831,9 +1858,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 (!cdev->polling) {
 		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
 				  dev);
+	} else {
+		cdev->hrtimer.function = &hrtimer_callback;

I think you can move this assignment to m_can_class_register(). We only need to set the function once.

Quoted 38 lines
drivers/net/can/m_can/m_can.c +0 -0
 	}
 
 	if (err < 0) {
drivers/net/can/m_can/m_can.h +4 -0
index a839dc71dc9b..e9db5cce4e68 100644
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/freezer.h>
+#include <linux/hrtimer.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
@@ -93,6 +94,9 @@ struct m_can_classdev {
 	int is_peripheral;
 
 	struct mram_cfg mcfg[MRAM_CFG_NUM];
+
+	struct hrtimer hrtimer;
+	bool polling;
 };
 
 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 -0
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
 //
 // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
+#include <linux/hrtimer.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 

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

Quoted 4 lines
drivers/net/can/m_can/m_can_platform.c +0 -1
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
 		goto probe_fail;
 
 	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");

I think irq will be uninitialized after this change. Although the compiler doesn't complain :(

BTW: I think we don't need the "polling" variable in the priv. We can make use of "irq". "irq" being 0 means use polling.

Quoted 7 lines
drivers/net/can/m_can/m_can_platform.c +2 -2
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
 		goto probe_fail;
 	}
 

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

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}
+		if (irq < 0) {
+			ret = -ENXIO;

Please return the original error code.

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

Quoted 12 lines
drivers/net/can/m_can/m_can_platform.c +9 -0
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}
+
 	/* message ram could be shared */
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
 	if (!res) {

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 v7 2/2] can: m_can: Add hrtimer to generate software interrupt

Hello Marc,

Quoted 8 lines · Marc Kleine-Budde
Quoted 3 lines · Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

Please add a sentence why you introduce polling mode, i.e. there are SoCs where the M_CAN interrupt is not available on the CPUs (which are running Linux).

Sure, I can do that, thanks.

Quoted 50 lines
Quoted 50 lines

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.

---
Changelog:
v7:
- Clean up m_can_platform.c if/else section after removing poll-interval
- Remove poll-interval from patch description
v6:
- Move hrtimer stop/start function calls to m_can_open and m_can_close to support power suspend/resume
v5:
- Change dev_dbg to dev_info if hardware interrupt exists and polling is enabled
v4:
- No changes
v3:
- Create a define for 1 ms polling interval
- Change plarform_get_irq to optional to not print error msg v2:
- Add functionality to check for 'poll-interval' property in MCAN node
- Add 'polling' flag in driver to check if device is using polling method
- Check for timer polling and hardware interrupt cases, default to hardware interrupt method
- Change ns_to_ktime() to ms_to_ktime()

---
  drivers/net/can/m_can/m_can.c          | 33 ++++++++++++++++++++++++--
  drivers/net/can/m_can/m_can.h          |  4 ++++
  drivers/net/can/m_can/m_can_platform.c | 25 ++++++++++++++++---
  3 files changed, 57 insertions(+), 5 deletions(-)
drivers/net/can/m_can/m_can.c +1 -0
index a5003435802b..f273d989bdff 100644
@@ -11,6 +11,7 @@
  #include <linux/bitfield.h>
  #include <linux/can/dev.h>
  #include <linux/ethtool.h>
+#include <linux/hrtimer.h>
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/iopoll.h>
@@ -308,6 +309,9 @@ enum m_can_reg {
  #define TX_EVENT_MM_MASK	GENMASK(31, 24)
  #define TX_EVENT_TXTS_MASK	GENMASK(15, 0)
 
Quoted 14 lines

drivers/net/can/m_can/m_can.c static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, · line 902

Quoted 12 lines
drivers/net/can/m_can/m_can.c +4 -1
+/* Hrtimer polling interval */
+#define HRTIMER_POLL_INTERVAL		1
+
  /* The ID and DLC registers are adjacent in M_CAN FIFO memory,
   * and we can save a (potentially slow) bus round trip by combining
   * reads and writes to them.
@@ -895,7 +899,7 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
  			netdev_dbg(dev, "Arbitration phase error detected\n");
  			work_done += m_can_handle_lec_err(dev, lec);
  		}
-		
+

Unrelated change. I've send a separate patch to fix the problem.

Sorry about this, this was not intentional.

Quoted 21 lines
Quoted 21 lines
drivers/net/can/m_can/m_can.c +6 -0
  		if (is_lec_err(dlec)) {
  			netdev_dbg(dev, "Data phase error detected\n");
  			work_done += m_can_handle_lec_err(dev, dlec);
@@ -1414,6 +1418,12 @@ static int m_can_start(struct net_device *dev)
 
  	m_can_enable_all_interrupts(cdev);
 
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Start hrtimer\n");
+		hrtimer_start(&cdev->hrtimer, ms_to_ktime(HRTIMER_POLL_INTERVAL),
+			      HRTIMER_MODE_REL_PINNED);
+	}
+
  	return 0;
  }
 
@@ -1571,6 +1581,11 @@ static void m_can_stop(struct net_device *dev)
  	/* disable all interrupts */
  	m_can_disable_all_interrupts(cdev);
 
Quoted 9 lines

drivers/net/can/m_can/m_can.c static void m_can_stop(struct net_device *dev) · line 1588

Quoted 5 lines
drivers/net/can/m_can/m_can.c +5 -0
+	if (cdev->polling) {
+		dev_dbg(cdev->dev, "Disabling the hrtimer\n");
+		hrtimer_cancel(&cdev->hrtimer);
+	}
+

This might be a racy. Please move the disabling of the hrtimer before disabling all interrupts. This makes it also symmetric with respect to m_can_start().

This makes sense.

Quoted 28 lines
Quoted 28 lines
drivers/net/can/m_can/m_can.c +12 -1
  	/* Set init mode to disengage from the network */
  	m_can_config_endisable(cdev, true);
 
@@ -1793,6 +1808,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
  	return NETDEV_TX_OK;
  }
 
+static 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(HRTIMER_POLL_INTERVAL));
+
+	return HRTIMER_RESTART;
+}
+
  static int m_can_open(struct net_device *dev)
  {
  	struct m_can_classdev *cdev = netdev_priv(dev);
@@ -1831,9 +1858,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 {
Quoted 8 lines

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

Quoted 5 lines
drivers/net/can/m_can/m_can.c +3 -0
+	} else if (!cdev->polling) {
  		err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name,
  				  dev);
+	} else {
+		cdev->hrtimer.function = &hrtimer_callback;

I think you can move this assignment to m_can_class_register(). We only need to set the function once.

Great idea!

Quoted 38 lines
Quoted 38 lines
drivers/net/can/m_can/m_can.c +0 -0
  	}
 
  	if (err < 0) {
drivers/net/can/m_can/m_can.h +4 -0
index a839dc71dc9b..e9db5cce4e68 100644
@@ -15,6 +15,7 @@
  #include <linux/device.h>
  #include <linux/dma-mapping.h>
  #include <linux/freezer.h>
+#include <linux/hrtimer.h>
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/iopoll.h>
@@ -93,6 +94,9 @@ struct m_can_classdev {
  	int is_peripheral;
 
  	struct mram_cfg mcfg[MRAM_CFG_NUM];
+
+	struct hrtimer hrtimer;
+	bool polling;
  };
 
  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 -0
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
  //
  // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
+#include <linux/hrtimer.h>
  #include <linux/phy/phy.h>
  #include <linux/platform_device.h>
 
Quoted 8 lines

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

Quoted 5 lines
drivers/net/can/m_can/m_can_platform.c +0 -1
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
  		goto probe_fail;
 
  	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");

I think irq will be uninitialized after this change. Although the compiler doesn't complain :(

Agreed, I did notice this when testing. But is it an issue?

Quoted 3 lines

BTW: I think we don't need the "polling" variable in the priv. We can make use of "irq". "irq" being 0 means use polling.

True, but is using the polling flag easier for the user to read?

Quoted 8 lines
Quoted 8 lines
drivers/net/can/m_can/m_can_platform.c +2 -2
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
  		goto probe_fail;
  	}
 
Quoted 10 lines

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

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}
+		if (irq < 0) {
+			ret = -ENXIO;

EINVAL? Wouldn't ENXIO (No such device or address) be more appropriate than invalid argument?

Quoted 15 lines

Please return the original error code.

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

Quoted 12 lines
drivers/net/can/m_can/m_can_platform.c +9 -0
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}
+
  	/* message ram could be shared */
  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
  	if (!res) {

~Judith

#6 lore raw

Re: [PATCH v7 2/2] can: m_can: Add hrtimer to generate software interrupt

In reply to Judith Mendez
Quoted 9 lines · Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

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.

...

Quoted 32 lines
drivers/net/can/m_can/m_can_platform.c +11 -3
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
 //
 // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
+#include <linux/hrtimer.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
 		goto probe_fail;
 
 	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
 		goto probe_fail;
 	}
 
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}

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

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+		if (irq < 0) {
+			ret = -ENXIO;
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}

Hi Judith,

it seems that with this change irq is only set in the first arm of the above conditional. But later on it is used unconditionally. That is, it may be used uninitialised.

Reported by gcc-12 as:

drivers/net/can/m_can/m_can_platform.c: In function 'm_can_plat_probe':
drivers/net/can/m_can/m_can_platform.c:150:30: warning: 'irq' may be used uninitialized [-Wmaybe-uninitialized]

   150 |         mcan_class->net->irq = irq;
       |         ~~~~~~~~~~~~~~~~~~~~~^~~~~
 drivers/net/can/m_can/m_can_platform.c:86:13: note: 'irq' was declared here
    86 |         int irq, ret = 0;
       |             ^~~
Quoted 8 lines
drivers/net/can/m_can/m_can_platform.c +1 -0
+
 	/* message ram could be shared */
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
 	if (!res) {
Signature · 1 line
2.17.1
#7 lore raw

Re: [PATCH v7 2/2] can: m_can: Add hrtimer to generate software interrupt

Hello Simon,

Quoted 64 lines · Simon Horman
Quoted 9 lines · Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

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.

...

Quoted 32 lines
drivers/net/can/m_can/m_can_platform.c +11 -3
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
  //
  // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
 
+#include <linux/hrtimer.h>
  #include <linux/phy/phy.h>
  #include <linux/platform_device.h>
 
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
  		goto probe_fail;
 
  	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
  		goto probe_fail;
  	}
 
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}

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

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+		if (irq < 0) {
+			ret = -ENXIO;
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}

Hi Judith,

it seems that with this change irq is only set in the first arm of the above conditional. But later on it is used unconditionally. That is, it may be used uninitialised.

Reported by gcc-12 as:

Quoted 8 lines

drivers/net/can/m_can/m_can_platform.c: In function 'm_can_plat_probe':
drivers/net/can/m_can/m_can_platform.c:150:30: warning: 'irq' may be used uninitialized [-Wmaybe-uninitialized]

    150 |         mcan_class->net->irq = irq;
        |         ~~~~~~~~~~~~~~~~~~~~~^~~~~
  drivers/net/can/m_can/m_can_platform.c:86:13: note: 'irq' was declared here
     86 |         int irq, ret = 0;
        |             ^~~

Maybe a good solution is to initialize irq=0 here.

Quoted 6 lines
Quoted 6 lines
drivers/net/can/m_can/m_can_platform.c +1 -0
+
  	/* message ram could be shared */
  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
  	if (!res) {
Signature · 1 line
2.17.1

~Judith

#8 lore raw

Re: [PATCH v7 2/2] can: m_can: Add hrtimer to generate software interrupt

Quoted 72 lines · Judith Mendez

Hello Simon,

Quoted 60 lines · Simon Horman
Quoted 9 lines · Judith Mendez

Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node.

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.

...

Quoted 28 lines
drivers/net/can/m_can/m_can_platform.c +11 -3
index 94dc82644113..b639c9e645d3 100644
@@ -5,6 +5,7 @@
  //
  // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
+#include <linux/hrtimer.h>
  #include <linux/phy/phy.h>
  #include <linux/platform_device.h>
@@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev)
  		goto probe_fail;
  	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");
-	irq = platform_get_irq_byname(pdev, "int0");
-	if (IS_ERR(addr) || irq < 0) {
-		ret = -EINVAL;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
  		goto probe_fail;
  	}
+	if (device_property_present(mcan_class->dev, "interrupts") ||
+	    device_property_present(mcan_class->dev, "interrupt-names")) {
+		irq = platform_get_irq_byname(pdev, "int0");
+		mcan_class->polling = false;
+		if (irq == -EPROBE_DEFER) {
+			ret = -EPROBE_DEFER;
+			goto probe_fail;
+		}

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

Quoted 10 lines
drivers/net/can/m_can/m_can_platform.c +10 -0
+		if (irq < 0) {
+			ret = -ENXIO;
+			goto probe_fail;
+		}
+	} else {
+		mcan_class->polling = true;
+		dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer");
+		hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC,
+			     HRTIMER_MODE_REL_PINNED);
+	}

Hi Judith,

it seems that with this change irq is only set in the first arm of the above conditional. But later on it is used unconditionally. That is, it may be used uninitialised.

Reported by gcc-12 as:

Quoted 8 lines

drivers/net/can/m_can/m_can_platform.c: In function 'm_can_plat_probe':
drivers/net/can/m_can/m_can_platform.c:150:30: warning: 'irq' may be used uninitialized [-Wmaybe-uninitialized]

    150 |         mcan_class->net->irq = irq;
        |         ~~~~~~~~~~~~~~~~~~~~~^~~~~
  drivers/net/can/m_can/m_can_platform.c:86:13: note: 'irq' was declared here
     86 |         int irq, ret = 0;
        |             ^~~
Quoted 1 line

Maybe a good solution is to initialize irq=0 here.

If it is valid for mcan_class->net->irq to be 0 in this case, then, yes, I agree.

Quoted 9 lines
Quoted 6 lines
Quoted 6 lines
drivers/net/can/m_can/m_can_platform.c +1 -0
+
  	/* message ram could be shared */
  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
  	if (!res) {
Signature · 1 line
2.17.1

~Judith