Skip to content

fix(arch/otg): unmask WKUP so USB resume reaches the class driver #19936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dakejahl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(arch/otg): unmask WKUP so USB resume reaches the class driver #19936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions arch/arm/src/at32/at32_otgfsdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5539,8 +5539,9 @@ static void at32_hwinitialize(struct at32_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_ENUMDNE |
OTGFS_GINT_IEP | OTGFS_GINT_OEP | OTGFS_GINT_USBRST);
regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_WKUP |
OTGFS_GINT_ENUMDNE | OTGFS_GINT_IEP | OTGFS_GINT_OEP |
OTGFS_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTGFS_GINT_IISOIXFR | OTGFS_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/common/stm32/stm32_otgfsdev_m3m4_v1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5533,8 +5533,9 @@ static void stm32_hwinitialize(struct stm32_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_ENUMDNE |
OTGFS_GINT_IEP | OTGFS_GINT_OEP | OTGFS_GINT_USBRST);
regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_WKUP |
OTGFS_GINT_ENUMDNE | OTGFS_GINT_IEP | OTGFS_GINT_OEP |
OTGFS_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTGFS_GINT_IISOIXFR | OTGFS_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/common/stm32/stm32_otghsdev_m3m4_v1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5426,8 +5426,9 @@ static void stm32_hwinitialize(struct stm32_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTGHS_GINT_RXFLVL | OTGHS_GINT_USBSUSP | OTGHS_GINT_ENUMDNE |
OTGHS_GINT_IEP | OTGHS_GINT_OEP | OTGHS_GINT_USBRST);
regval = (OTGHS_GINT_RXFLVL | OTGHS_GINT_USBSUSP | OTGHS_GINT_WKUP |
OTGHS_GINT_ENUMDNE | OTGHS_GINT_IEP | OTGHS_GINT_OEP |
OTGHS_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTGHS_GINT_IISOIXFR | OTGHS_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/efm32/efm32_usbdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5488,8 +5488,9 @@ static void efm32_hwinitialize(struct efm32_usbdev_s *priv)
/* Enable the interrupts in the INTMSK */

regval = (USB_GINTMSK_RXFLVLMSK | USB_GINTMSK_USBSUSPMSK |
USB_GINTMSK_ENUMDONEMSK | USB_GINTMSK_IEPINTMSK |
USB_GINTMSK_OEPINTMSK | USB_GINTMSK_USBRSTMSK);
USB_GINTMSK_WKUPINTMSK | USB_GINTMSK_ENUMDONEMSK |
USB_GINTMSK_IEPINTMSK | USB_GINTMSK_OEPINTMSK |
USB_GINTMSK_USBRSTMSK);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (USB_GINTMSK_INCOMPISOINMSK | USB_GINTMSK_INCOMPLPMSK);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/stm32f7/stm32_otgdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5666,8 +5666,9 @@ static void stm32_hwinitialize(struct stm32_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_ENUMDNE |
OTG_GINT_IEP | OTG_GINT_OEP | OTG_GINT_USBRST);
regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_WKUP |
OTG_GINT_ENUMDNE | OTG_GINT_IEP | OTG_GINT_OEP |
OTG_GINT_USBRST);

# ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTG_GINT_IISOIXFR | OTG_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/stm32h7/stm32_otgdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3362,7 +3362,7 @@
regval = stm32_getreg(STM32_OTG_DOEPCTL(0));
regval |= OTG_DOEPCTL0_CNAK;
stm32_putreg(regval, STM32_OTG_DOEPCTL(0));
}

Check failure on line 3365 in arch/arm/src/stm32h7/stm32_otgdev.c

View workflow job for this annotation

GitHub Actions / check 

Bad right brace alignment
}
break;

Expand Down Expand Up @@ -5565,8 +5565,9 @@

/* Enable the interrupts in the INTMSK */

regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_ENUMDNE |
OTG_GINT_IEP | OTG_GINT_OEP | OTG_GINT_USBRST);
regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_WKUP |
OTG_GINT_ENUMDNE | OTG_GINT_IEP | OTG_GINT_OEP |
OTG_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTG_GINT_IISOIXFR | OTG_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/src/stm32l4/stm32l4_otgfsdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5594,8 +5594,9 @@ static void stm32_hwinitialize(struct stm32_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_ENUMDNE |
OTGFS_GINT_IEP | OTGFS_GINT_OEP | OTGFS_GINT_USBRST);
regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_WKUP |
OTGFS_GINT_ENUMDNE | OTGFS_GINT_IEP | OTGFS_GINT_OEP |
OTGFS_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTGFS_GINT_IISOIXFR | OTGFS_GINT_IISOOXFR);
Expand Down
5 changes: 3 additions & 2 deletions arch/xtensa/src/esp32s3/esp32s3_otg_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5540,8 +5540,9 @@ static void esp32s3_hwinitialize(struct esp32s3_usbdev_s *priv)

/* Enable the interrupts in the INTMSK */

regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_ENUMDNE |
OTG_GINT_IEP | OTG_GINT_OEP | OTG_GINT_USBRST);
regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_WKUP |
OTG_GINT_ENUMDNE | OTG_GINT_IEP | OTG_GINT_OEP |
OTG_GINT_USBRST);

#ifdef CONFIG_USBDEV_ISOCHRONOUS
regval |= (OTG_GINT_IISOIXFR | OTG_GINT_IISOOXFR);
Expand Down
Loading