dts: stm32f3: Remap USB IRQ to avoid conflict with CAN #22373

erwango · 2020-01-31T13:27:51Z

On stm32f302/3 series, USB and CAN_1 share same IRQ lines.
To use USB and CAN_1 together, USB IRQ could be remap to other
line numbers, on which there is no conflict.
Remap the USB IRQ lines by default:
-Assign remap number in matching dtsi files
-Perform remap in usb driver init

Additionally, fix compilation issue in usb driver.

Fixes #22343

Signed-off-by: Erwan Gouriou [email protected]

erwango · 2020-01-31T14:25:38Z

@giellamoswhard can you test and confirm this helps you enabling CAN_1 and USB at the same time?

ghost · 2020-01-31T14:48:18Z

@erwang I've tried you pull request: now it builds without errors but I have runtime troubles: when I run it USB is not recognized anymore by linux.

[ 1262.105222] usb 1-6.4: Device not responding to setup address.
[ 1262.313225] usb 1-6.4: Device not responding to setup address.
[ 1262.521093] usb 1-6.4: device not accepting address 39, error -71
[ 1262.521191] usb 1-6-port4: unable to enumerate USB device

tagunil · 2020-01-31T14:49:12Z

dts/arm/st/f3/stm32f302.dtsi

@@ -8,6 +8,11 @@

 / {
 	soc {
+		usb: usb@40005c00 {
+			/* Remap USB_LB IRQ to enable use with CAN_1 */


Isn't it USB_LP?

tagunil · 2020-01-31T14:49:26Z

dts/arm/st/f3/stm32f303.dtsi

@@ -8,6 +8,11 @@

 / {
 	soc {
+		usb: usb@40005c00 {
+			/* Remap USB_LB IRQ to enable use with CAN_1 */


Isn't it USB_LP?

erwango · 2020-01-31T14:56:31Z

@giellamoswhard Thanks for quick feedback.

@erwang I've tried you pull request: now it builds without errors but I have runtime troubles: when I run it USB is not recognized anymore by linux.

Do you mean this was working fine previously with USB only?

ghost · 2020-01-31T15:14:16Z

@erwango Thank you for the PR.

Yes if I build it with master it works (both usb and can)
Using the pull request it seems that:

USB and CAN can be built together
CAN alone works
USB alone works on cdc profile but fails on hid profile

[00:00:00.006,000] main.composite_pre_init: HID Device: dev 0x2004
[00:00:00.006,000] main.main: Starting application
[00:00:00.006,000] usb_dc_stm32: System Configuration Controller

erwango · 2020-01-31T15:16:30Z

@giellamoswhard ok. It is likely that something is missing in IRQ remap operation. I'll need to test and debug. I don't have hw with me, so it will have to wait next week.

ghost · 2020-01-31T15:26:54Z

@erwango Ok, thanks for the support.

Don't know if it can be useful but datasheet says that setting USB_IT_RMP all three USB interrupts are remapped (to 74, 75, 76) but new DTS only has a configuration for USB_LP.

ydamigos · 2020-02-01T17:36:39Z

@erwango I tried it on stm32f3_disco with samples/subsys/usb/cdc_acm without enabling CAN. I get the following error and the USB device is not recognized:

*** Booting Zephyr OS build zephyr-v2.1.0-1540-gc01c00b71b21  ***
[00:00:00.005,000] <err> usb_dc_stm32: System Configuration Controller clock is disabled. Unable to enable IRQ remapping.
[00:00:00.005,000] <inf> cdc_acm_echo: Wait for DTR

SYSCFG clock is not enabled. The following patch (I opened a PR in your repository), fixed the USB issue:

diff --git a/drivers/clock_control/clock_stm32f0_f3.c b/drivers/clock_control/clock_stm32f0_f3.c
index d35b03cee9..e1b68698d2 100644
--- a/drivers/clock_control/clock_stm32f0_f3.c
+++ b/drivers/clock_control/clock_stm32f0_f3.c
@@ -77,6 +77,11 @@ void config_enable_default_clocks(void)
        /* Enable System Configuration Controller clock. */
        LL_APB1_GRP2_EnableClock(LL_APB1_GRP2_PERIPH_SYSCFG);
 #endif
+#else
+#if defined(CONFIG_USB_DC_STM32)
+       /* Enable System Configuration Controller clock. */
+       LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_SYSCFG);
+#endif
 #endif /* !CONFIG_SOC_SERIES_STM32F3X */
 }

Then, I enabled CAN. USB device is not recognized anymore and I don't get an error in logs. I don't have a external CAN bus transceiver to test CAN.

erwango · 2020-02-04T08:16:35Z

@ydamigos

SYSCFG clock is not enabled. The following patch (I opened a PR in your repository), fixed the USB issue:

Ok, I got my mistake. SYSCONFIG is indeed enabled in gpio_stm32_enable_int. But this one is not part of gpio_init, only happens if we configure a pin with interrupts (as the name suggests..).
Will fix that first and then check out the last issue.

erwango · 2020-02-04T10:05:09Z

@ydamigos , I'm seeing issue on stm32f3_disco on samples/subsys/usb/cdc_acm on master already.

*** Booting Zephyr OS build zephyr-v2.1.0-1657-g9897c3b0dda2  ***
[00:00:00.005,000] <inf> cdc_acm_echo: Wait for DTR
[00:00:00.008,000] <inf> usb_cdc_acm: USB device suspended

And nothing in dmesg.

Do you see the same?

zephyrbot · 2020-02-04T10:15:09Z

All checks passed.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

ydamigos · 2020-02-04T19:11:03Z

@ydamigos , I'm seeing issue on stm32f3_disco on samples/subsys/usb/cdc_acm on master already.
*** Booting Zephyr OS build zephyr-v2.1.0-1657-g9897c3b0dda2  ***
[00:00:00.005,000] <inf> cdc_acm_echo: Wait for DTR
[00:00:00.008,000] <inf> usb_cdc_acm: USB device suspended
And nothing in dmesg.

Do you see the same?

It works fine with master for me. A common mistake I do with stm32f3_disco is that I always forget to plug a usb cable to USB USER port. So I have to ask, did you plug a cable to USB USER port?

erwango · 2020-02-05T07:41:54Z

It works fine with master for me. A common mistake I do with stm32f3_disco is that I always forget to plug a usb cable to USB USER port. So I have to ask, did you plug a cable to USB USER port?

Yes I did, but this is a fair question :-)!

erwango · 2020-02-10T14:01:37Z

@giellamoswhard, @ydamigos can you have a new try ?
Change is working on my side now (tested with CAN enabled).

ydamigos

@erwango Something is wrong with the commits. I see 2 commits with similar message.

ydamigos · 2020-02-10T18:26:10Z

drivers/usb/device/usb_dc_stm32.c

@@ -303,6 +303,18 @@ static int usb_dc_stm32_init(void)
 	HAL_StatusTypeDef status;
 	unsigned int i;

+#ifdef SYSCFG_CFGR1_USB_IT_RMP


Could we move it to usb_dc_attach() where we do also the pin remapping?

On stm32f302/3 series, USB and CAN_1 share same IRQ lines. To use USB and CAN_1 together, USB IRQ could be remap to other line numbers, on which there is no conflict. Remap the USB IRQ lines by default: -Assign remap number in matching dtsi files -Perform remap before usb driver init Additionally, fix compilation issue in usb driver. Fixes zephyrproject-rtos#22343 Signed-off-by: Erwan Gouriou <[email protected]> Signed-off-by: Yannis Damigos <[email protected]> Signed-off-by: Erwan Gouriou <[email protected]>

ghost · 2020-02-11T08:21:03Z

@erwango HI, I'm testing on my custom board (stm32f303rc) with both can and usb configured:

Can example build and works
cdc_acm example seems to work but my linux refuses to enumerate the board

[ 3366.273290] usb 1-5.4: new full-speed USB device number 59 using xhci_hcd
[ 3366.473173] usb 1-5.4: device descriptor read/64, error -32
[ 3366.785158] usb 1-5.4: device descriptor read/64, error -32
[ 3366.893273] debugfs: Directory '34' with parent 'devices' already present!
[ 3367.073163] usb 1-5.4: new full-speed USB device number 60 using xhci_hcd
[ 3367.273099] usb 1-5.4: device descriptor read/64, error -32

erwango · 2020-02-11T08:23:40Z

@giellamoswhard can you try to boot and then plug/unplug ?

ghost · 2020-02-11T08:34:10Z

@erwango
I did it but the same result, even if I disable CAN drivers.
But now it seems I get the same result from master so maybe it is another problem (a bit strange: last week I was able to use USB)

ghost · 2020-02-11T08:56:14Z

@erwango It seems something I have something hw broken on the USB side, but my build and can test works.

erwango · 2020-02-11T09:05:40Z

@erwango It seems something I have something hw broken on the USB side, but my build and can test works.

@giellamoswhard opposite on my side: Things are working now. Maybe @ydamigos can give his status?

ghost · 2020-02-11T09:14:46Z

@erwango It works now ! Sorry but doing doing the test I deleted the pinmuxes of USB.

ydamigos

Test on stm32f3_disco with samples/subsys/usb/cdc_acm enabling CAN and it works fine.

erwango added bug The issue is a bug, or the PR is fixing a bug platform: STM32 ST Micro STM32 labels Jan 31, 2020

erwango requested a review from ydamigos January 31, 2020 13:27

erwango requested a review from loicpoulain as a code owner January 31, 2020 13:27

zephyrbot added the area: Devicetree label Jan 31, 2020

erwango added the block: HW Test Testing on hardware required before merging label Jan 31, 2020

tagunil reviewed Jan 31, 2020

View reviewed changes

erwango force-pushed the fix_f3_usb_can_it_conflict branch 2 times, most recently from a4edd30 to d8d41d5 Compare February 4, 2020 10:12

erwango force-pushed the fix_f3_usb_can_it_conflict branch from d8d41d5 to 7e2c332 Compare February 4, 2020 10:16

ydamigos requested changes Feb 10, 2020

View reviewed changes

erwango force-pushed the fix_f3_usb_can_it_conflict branch from 6f23410 to 3bdbebd Compare February 11, 2020 08:01

erwango requested a review from ydamigos February 11, 2020 08:01

erwango force-pushed the fix_f3_usb_can_it_conflict branch from 3bdbebd to b86fba8 Compare February 11, 2020 08:05

erwango removed the block: HW Test Testing on hardware required before merging label Feb 11, 2020

ydamigos approved these changes Feb 11, 2020

View reviewed changes

erwango requested a review from galak February 14, 2020 13:05

galak approved these changes Feb 14, 2020

View reviewed changes

galak added this to the v2.2.0 milestone Feb 14, 2020

MaureenHelm approved these changes Feb 14, 2020

View reviewed changes

jhedberg merged commit 557d263 into zephyrproject-rtos:master Feb 18, 2020

erwango deleted the fix_f3_usb_can_it_conflict branch June 5, 2020 10:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dts: stm32f3: Remap USB IRQ to avoid conflict with CAN #22373

dts: stm32f3: Remap USB IRQ to avoid conflict with CAN #22373

erwango commented Jan 31, 2020

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020

tagunil Jan 31, 2020

tagunil Jan 31, 2020

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020 •

edited by ghost

Loading

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020

ydamigos commented Feb 1, 2020 •

edited

Loading

erwango commented Feb 4, 2020

erwango commented Feb 4, 2020 •

edited

Loading

zephyrbot commented Feb 4, 2020 •

edited

Loading

ydamigos commented Feb 4, 2020

erwango commented Feb 5, 2020

erwango commented Feb 10, 2020

ydamigos left a comment

ydamigos Feb 10, 2020

erwango Feb 11, 2020

ghost commented Feb 11, 2020

erwango commented Feb 11, 2020

ghost commented Feb 11, 2020

ghost commented Feb 11, 2020

erwango commented Feb 11, 2020

ghost commented Feb 11, 2020

ydamigos left a comment

dts: stm32f3: Remap USB IRQ to avoid conflict with CAN #22373

dts: stm32f3: Remap USB IRQ to avoid conflict with CAN #22373

Conversation

erwango commented Jan 31, 2020

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020

tagunil Jan 31, 2020

Choose a reason for hiding this comment

tagunil Jan 31, 2020

Choose a reason for hiding this comment

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020 • edited by ghost Loading

erwango commented Jan 31, 2020

ghost commented Jan 31, 2020

ydamigos commented Feb 1, 2020 • edited Loading

erwango commented Feb 4, 2020

erwango commented Feb 4, 2020 • edited Loading

zephyrbot commented Feb 4, 2020 • edited Loading

ydamigos commented Feb 4, 2020

erwango commented Feb 5, 2020

erwango commented Feb 10, 2020

ydamigos left a comment

Choose a reason for hiding this comment

ydamigos Feb 10, 2020

Choose a reason for hiding this comment

erwango Feb 11, 2020

Choose a reason for hiding this comment

ghost commented Feb 11, 2020

erwango commented Feb 11, 2020

ghost commented Feb 11, 2020

ghost commented Feb 11, 2020

erwango commented Feb 11, 2020

ghost commented Feb 11, 2020

ydamigos left a comment

Choose a reason for hiding this comment

ghost commented Jan 31, 2020 •

edited by ghost

Loading

ydamigos commented Feb 1, 2020 •

edited

Loading

erwango commented Feb 4, 2020 •

edited

Loading

zephyrbot commented Feb 4, 2020 •

edited

Loading