mmc: omap_hsmmc: Enable SDIO IRQ
Subsystems (3)
v14 cover mmc: omap_hsmmc: Enable SDIO IRQ
Hi Balaji, Tony, Ulf, all
v14
- drop all ifdef/endif introduced by v13
-- rely on pinctrl_lookup_state to prevent ifdef CONFIG_PM -- benefit: all code is compile tested no matter the configuration -- drawback: require wake_irq/pinctrl configuration even when
runtime suspend is not configured
- drop runtime state from debugfs output
- rebased onto current mmc-next 06732b84b4cf
v13
- fix compile breaks if !CONFIG_PM
- additional patch: install dummy pm runtime hooks if !CONFIG_PM_RUNTIME
v12
- drop !CONFIG_OF compile break only exists when
#undef CONFIG_OF after include headers 1/7(Sebastian Reichel)
- do not emit "falling back to polling" if wake_irq not specified since MMC does not need it, and it might confuse users only emit if pinmux default/idle is not present or claiming the irq failed 2/7(Balaji)
- dropped out-of-tree patches 6/7(Balaji)
- mention "ti,am33xx-hsmmc" compatible section in bindings documentation 1/5
v11
- split !CONFIG_OF compile break into separate patch
- enable IWE/CLKEXTFREE in CON/HCTL register needed for omap4
- '&' vs '&&' in omap_hsmmc_resume, 1/5 (Andreas Müller)
- #define DLEV_DAT instead of BIT(21) 2/5 (Balaji)
- pinctrl_pm_select_default_state() removed, 4/5 (Balaji)
- drop _irqsave/_irqrestore from omap_hsmmc_wake_irq handler since it can't be preempted by same priority omap_hsmmc_irq handler 1/5(Joel Fernandes)
- replace devres_open_group by explicit devm_free calls 1/5 (Balaji)
- disable_irq_nosync wake_irq since we handle it thread safe 1/5 (Balaji)
- drop 'gpio_dat1' pinctrl states and rework documentation 5/5 (Balaji)
v10
- bug fix on multi-core, untested
- incorporated changes from Balaji
- use devres / RAII mechanism to configure wake_up / sdio irq capabilities
- drop pinctrl state 'active'
rely on driver-model states 'default', 'idle'
- add specific 'gpio_dat1' state for am335x SWAKEUP hack
- reorganized patches; +1 patch multi-core bugfix / +1 for pinctrl
- rebased 455c6fdbd21916 / cherry-picks from mmc-next
v9
- extended comment about why wake-irq is needed
- drop double '(' ')' around card_detect_irq
- drop final '.' in in subject line of patch
v8
- rebased on top of Tony Lindgren<[email protected]> changes
- improved changelog describing the earlier work
- improved wakeup irq setup
- works for am3730 es platform now
- my changes on top:
- compile tested with #undef CONFIG_OF
- disable wake_irq in handler to prevent infinite loop
- fixed typo and added comment about wake-irq
v7
- rebase on 3.14.0-rc3-49726-g77e15ec
- split omap_hsmmc_pin_init due to regression on omap-3730 platform
v6
- rebase on Linux 3.13-rc3
- reformatting debugfs
v5
- fix compile error introduced by last minute one line fix
v4:
- switch to interrupts-extended format
- drop ti,swakeup-missing flag convert to comaptible section
v3:
- removed gpio_irq from platform_data
v2:
- incorparated changes as suggested by reviewers
- simplified workaround for am335x, gpio will now only wake the module from runtime suspend, not handle the sdio irq itself
Andreas Fenkart (6):
mmc: omap_hsmmc: Enable SDIO interrupt
mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
mmc: omap_hsmmc: enable wakeup event for sdio OMAP4
mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected
mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks
mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on
AM335x
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ drivers/mmc/host/omap_hsmmc.c | 283 ++++++++++++++++++-- include/linux/platform_data/mmc-omap.h | 1 + 3 files changed, 317 insertions(+), 21 deletions(-)
Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v14 1/6 mmc: omap_hsmmc: Enable SDIO interrupt
There have been various patches floating around for enabling the SDIO IRQ for hsmmc, but none of them ever got merged.
Probably the reason for not merging the SDIO interrupt patches has been the lack of wake-up path for SDIO on some omaps that has also needed remuxing the SDIO DAT1 line to a GPIO making the patches complex.
This patch adds the minimal SDIO IRQ support to hsmmc for omaps that do have the wake-up path. For those omaps, the DAT1 line need to have the wake-up enable bit set, and the wake-up interrupt is the same as for the MMC controller.
This patch has been tested on am3730 es1.2 with mwifiex connected to MMC3 with mwifiex waking to Ethernet traffic from off-idle mode. Note that for omaps that do not have the SDIO wake-up path, this patch will not work for idle modes and further patches for remuxing DAT1 to GPIO are needed.
Based on earlier patches [1][2] by David Vrabel <[email protected]>, Steve Sakoman <[email protected]>
For now, only support SDIO interrupt if we are booted with a separate wake-irq configued via device tree. This is because omaps need the wake-irq for idle states, and some omaps need special quirks. And we don't want to add new legacy mux platform init code callbacks any longer as we are moving to DT based booting anyways.
To use it, you need to specify the wake-irq using the interrupts-extended property.
[1] http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux.git;a=commitdiff_plain;h=010810d22f6f49ac03da4ba384969432e0320453
[2] http://comments.gmane.org/gmane.linux.kernel.mmc/20446
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +1 -0
@@ -12,6 +12,7 @@ Required properties: Should be "ti,omap3-hsmmc", for OMAP3 controllers Should be "ti,omap3-pre-es3-hsmmc" for OMAP3 controllers pre ES3.0 Should be "ti,omap4-hsmmc", for OMAP4 controllers + Should be "ti,am33xx-hsmmc", for AM335x controllers - ti,hwmods: Must be "mmc<n>", n is controller instance starting 1 Optional properties:
drivers/mmc/host/omap_hsmmc.c +189 -12
350 lines not on this page · raw message
include/linux/platform_data/mmc-omap.h +1 -0
@@ -28,6 +28,7 @@*/ #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0)#define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1) +#define OMAP_HSMMC_SWAKEUP_MISSING BIT(2)struct mmc_card ;
Signature · 1 line
1.7.10.4
Re: [PATCH v14 1/6] mmc: omap_hsmmc: Enable SDIO interrupt
Hi Andreas,
Quoted 3 lines · Andreas Fenkart
There have been various patches floating around for enabling the SDIO IRQ for hsmmc, but none of them ever got merged.
[...]
Quoted 10 lines
For now, only support SDIO interrupt if we are booted with a separate wake-irq configued via device tree. This is because omaps need the wake-irq for idle states, and some omaps need special quirks. And we don't want to add new legacy mux platform init code callbacks any longer as we are moving to DT based booting anyways.
To use it, you need to specify the wake-irq using the interrupts-extended property.
First, thanks a lot for your tenacity on this patchset, this was a long needed feature. I enabled the SDIO interrupt, and got the throughput of my 88W8686-based chip multiplied by 15. Nice! I just have an issue with the wake-up path, and maybe you could help me.
According to the DM3730 TRM, the MMC2 has the SWAKEUP path. So first I tried to give the same wake-irq as the MMC's one, but omap_hsmmc_configure_wake_irq() fails to request it, as they are not IRQF_SHARED.
So I used the DAT1 for the wake-irq (see patch below), and things are working. But I get ~2000 wake-irq per seconds, even without any activity on the WiFi. As a result, the driver is ping-ponging between omap_hsmmc_runtime_suspend() and omap_hsmmc_runtime_resume(), causing kworker to eat most of my CPU.
Am I missing something obvious?
Thanks!
Florian
commit 9e1602f58aa4605a8e8392533783720d899debed
Author: Florian Vaussard <[email protected]> Date: Sun Aug 24 09:58:04 2014 +0200
WIP: Enable SDIO IRQ for Wifi on MMC2
arch/arm/boot/dts/omap3-overo-base.dtsi +4 -1
@@ -119,7 +119,7 @@ OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */ OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */ - OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ + OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ >;
@@ -195,6 +195,9 @@ vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; bus-width = <4>; cap-sdio-irq; + + interrupts-extended = <&intc 86>, + <&gpio5 5 GPIO_ACTIVE_HIGH>; /* gpio_133 (mmc2.dat1) */ non-removable; };
arch/arm/boot/dts/omap3.dtsi +0 -1
@@ -417,7 +417,6 @@ mmc2: mmc@480b4000 { compatible = "ti,omap3-hsmmc"; reg = <0x480b4000 0x200>; - interrupts = <86>; ti,hwmods = "mmc2"; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";
Re: [PATCH v14 1/6] mmc: omap_hsmmc: Enable SDIO interrupt
Hi Florian
2014-08-24 10:26 GMT+02:00 Florian Vaussard <[email protected]>:
Quoted 25 lines
Hi Andreas,
Quoted 3 lines · Andreas Fenkart
There have been various patches floating around for enabling the SDIO IRQ for hsmmc, but none of them ever got merged.
[...]
Quoted 10 lines
For now, only support SDIO interrupt if we are booted with a separate wake-irq configued via device tree. This is because omaps need the wake-irq for idle states, and some omaps need special quirks. And we don't want to add new legacy mux platform init code callbacks any longer as we are moving to DT based booting anyways.
To use it, you need to specify the wake-irq using the interrupts-extended property.
First, thanks a lot for your tenacity on this patchset, this was a long needed feature. I enabled the SDIO interrupt, and got the throughput of my 88W8686-based chip multiplied by 15. Nice! I just have an issue with the wake-up path, and maybe you could help me.
Quoted 4 lines
According to the DM3730 TRM, the MMC2 has the SWAKEUP path. So first I tried to give the same wake-irq as the MMC's one, but
omap_hsmmc_configure_wake_irq()fails to request it, as they are notIRQF_SHARED.
Why can't it be shared?
Quoted 12 lines
So I used the DAT1 for the wake-irq (see patch below), and things are working. But I get ~2000 wake-irq per seconds, even without any activity on the WiFi. As a result, the driver is ping-ponging between
omap_hsmmc_runtime_suspend()andomap_hsmmc_runtime_resume(), causing kworker to eat most of my CPU.Am I missing something obvious?
Thanks!
Florian
Re: [PATCH v14 1/6] mmc: omap_hsmmc: Enable SDIO interrupt
Hi Andreas,
Quoted 28 lines · Andreas Fenkart
Hi Florian
2014-08-24 10:26 GMT+02:00 Florian Vaussard <[email protected]>:
Quoted 25 lines
Hi Andreas,
Quoted 3 lines · Andreas Fenkart
There have been various patches floating around for enabling the SDIO IRQ for hsmmc, but none of them ever got merged.
[...]
Quoted 10 lines
For now, only support SDIO interrupt if we are booted with a separate wake-irq configued via device tree. This is because omaps need the wake-irq for idle states, and some omaps need special quirks. And we don't want to add new legacy mux platform init code callbacks any longer as we are moving to DT based booting anyways.
To use it, you need to specify the wake-irq using the interrupts-extended property.
First, thanks a lot for your tenacity on this patchset, this was a long needed feature. I enabled the SDIO interrupt, and got the throughput of my 88W8686-based chip multiplied by 15. Nice! I just have an issue with the wake-up path, and maybe you could help me.
Quoted 7 lines
Quoted 4 lines
According to the DM3730 TRM, the MMC2 has the SWAKEUP path. So first I tried to give the same wake-irq as the MMC's one, but
omap_hsmmc_configure_wake_irq()fails to request it, as they are notIRQF_SHARED.Why can't it be shared?
I first tried
interrupts-extended = <&intc 86 &intc 86>;
but devm_request_irq() in omap_hsmmc_configure_wake_irq() fails. But this is probably not the good approach, as Tony pointed out.
Regards,
Florian
Re: [PATCH v14 1/6] mmc: omap_hsmmc: Enable SDIO interrupt
In reply to Florian Vaussardarch/arm/boot/dts/omap3-overo-base.dtsi line 125
Quoted 11 lines · Florian Vaussard
arch/arm/boot/dts/omap3-overo-base.dtsi +1
-1@@ -119,7 +119,7 @@ OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */ OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */ - OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ + OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ >;
No need to have PIN_OFF_WAKEUPENABLE any longer here, it gets enabled automatically after you do request_irq on it.
arch/arm/boot/dts/omap3-overo-base.dtsi line 202
Quoted 9 lines
arch/arm/boot/dts/omap3-overo-base.dtsi +3
-0@@ -195,6 +195,9 @@ vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; bus-width = <4>; cap-sdio-irq; + + interrupts-extended = <&intc 86>, + <&gpio5 5 GPIO_ACTIVE_HIGH>; /* gpio_133 (mmc2.dat1) */ non-removable; };
The second interrupt here just needs to be &omap3_pmx_core (or &omap3_pmx_core2 depending where it's located) with the offset to the dat1 pin from it's padconf area. For example, on mmc3 it should be:
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
So you need to look it up from the TRM to figure out the right offset for mmc2.
arch/arm/boot/dts/omap3.dtsi line 422
Quoted 12 lines
arch/arm/boot/dts/omap3.dtsi +0
-1@@ -417,7 +417,6 @@ mmc2: mmc@480b4000 { compatible = "ti,omap3-hsmmc"; reg = <0x480b4000 0x200>; - interrupts = <86>; ti,hwmods = "mmc2"; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";
I think there's a patch now in mainline tree that by default tries to use interrupts-extended first, so this may not need to be changed.
Regards,
Tony
Re: [PATCH v14 1/6] mmc: omap_hsmmc: Enable SDIO interrupt
Hi Tony, Andreas,
Quoted 16 lines · Tony Lindgren
arch/arm/boot/dts/omap3-overo-base.dtsi line 125
Quoted 11 lines · Florian Vaussard
arch/arm/boot/dts/omap3-overo-base.dtsi +1
-1@@ -119,7 +119,7 @@ OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */ OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */ - OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ + OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ >;No need to have
PIN_OFF_WAKEUPENABLEany longer here, it gets enabled automatically after you dorequest_irqon it.
Good to know.
Quoted 15 lines
arch/arm/boot/dts/omap3-overo-base.dtsi line 202
Quoted 9 lines
arch/arm/boot/dts/omap3-overo-base.dtsi +3
-0@@ -195,6 +195,9 @@ vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; bus-width = <4>; cap-sdio-irq; + + interrupts-extended = <&intc 86>, + <&gpio5 5 GPIO_ACTIVE_HIGH>; /* gpio_133 (mmc2.dat1) */ non-removable; };The second interrupt here just needs to be
&omap3_pmx_core(or&omap3_pmx_core2depending where it's located) with the offset to the dat1 pin from it's padconf area. For example, on mmc3 it should be:
Quoted 5 lines
interrupts-extended = <&intc 94
&omap3_pmx_core20x46>;So you need to look it up from the TRM to figure out the right offset for mmc2.
So now I have:
interrupts-extended = <
&intc 86 &omap3_pmx_core OMAP_IOPAD_OFFSET(0x215e, 0x2030)>;
I checked that I have the right offset in the .dtb for mmc2_dat according to the TRM (0x12E). But the wake-up path seems to be not working any more. I get several timeouts and a BUG() inside libertas SDIO driver.
[ 16.286407] libertas_sdio mmc0:0001:1 (unregistered net_device): 00:19:88:15:b7:c0, fw 9.70.3p24, cap 0x00000303 [ 16.292938] libertas_sdio mmc0:0001:1 wlan0: Marvell WLAN 802.11 adapter [ 16.302703] cfg80211: Calling CRDA to update world regulatory domain [ 24.758880] libertas_sdio mmc0:0001:1 wlan0: command 0x0006 timed out [ 24.759582] libertas_sdio mmc0:0001:1 wlan0: Timeout submitting command 0x0006 [ 24.761962] libertas_sdio mmc0:0001:1 wlan0: PREP_CMD: command 0x0006 failed: -110 [ 24.762084] libertas_sdio: Resetting card... [ 29.768890] libertas_sdio mmc0:0001:1 wlan0: command 0x0006 timed out [ 29.769378] libertas_sdio mmc0:0001:1 wlan0: Timeout submitting command 0x0006 [ 29.769531] libertas_sdio mmc0:0001:1 wlan0: PREP_CMD: command 0x0006 failed: -110 [ 29.770538] ------------[ cut here ]------------ [ 29.775421] kernel BUG at drivers/net/wireless/libertas/if_sdio.c:226! [ 29.782287] Internal error: Oops - BUG: 0 [#1] PREEMPT ARM [ 29.788055] Modules linked in: [ 29.791290] CPU: 0 PID: 471 Comm: ksdioirqd/mmc0 Not tainted 3.16.1mobovero-00014-g9e1602f-dirty #690 [ 29.800994] task: dd81c480 ti: def48000 task.ti: def48000 [ 29.806671] PC is at if_sdio_interrupt+0x1b4/0x330 [ 29.811737] LR is at if_sdio_interrupt+0x194/0x330 [ 29.816772] pc : [<c0428e68>] lr : [<c0428e48>] psr: 200e0093 [ 29.816772] sp : def49ed0 ip : def49ed0 fp : def49efc [ 29.828826] r10: 00000000 r9 : 00000000 r8 : dece0024 [ 29.834320] r7 : 0000016e r6 : 00000001 r5 : 800e0013 r4 : decc43c0 [ 29.841186] r3 : 0000051b r2 : 000003b3 r1 : 00000001 r0 : 00000001 [ 29.848052] Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel [ 29.855834] Control: 10c5387d Table: 9edd4019 DAC: 00000015 [ 29.861877] Process ksdioirqd/mmc0 (pid: 471, stack limit = 0xdef48240) [ 29.868835] Stack: (0xdef49ed0 to 0xdef4a000) [ 29.873413] 9ec0: 00000000 00000000 c04d82b0 00000001 [ 29.882019] 9ee0: df4c9000 dec7f400 00000000 00000001 def49f34 def49f00 c04d010c c0428cc0 [ 29.890624] 9f00: 00100100 00200200 def49f34 dec7f400 def48000 dec7f400 def48000 7fffffff [ 29.899230] 9f20: 00000000 00000001 def49f64 def49f38 c04d02f8 c04d00d4 c04d024c 00000001 [ 29.907836] 9f40: 00000000 dd9bda40 00000000 dec7f400 c04d024c 00000000 def49fac def49f68 [ 29.916442] 9f60: c005c724 c04d0258 def49f94 00000000 c0066e50 dec7f400 00000000 def49f7c [ 29.925048] 9f80: def49f7c 00000000 def49f88 def49f88 dd9bda40 c005c644 00000000 00000000 [ 29.933654] 9fa0: 00000000 def49fb0 c000f1a8 c005c650 00000000 00000000 00000000 00000000 [ 29.942260] 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 29.950866] 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [ 29.959503] [<c0428e68>] (if_sdio_interrupt) from [<c04d010c>] (process_sdio_pending_irqs+0x44/0x184) [ 29.969207] [<c04d010c>] (process_sdio_pending_irqs) from [<c04d02f8>] (sdio_irq_thread+0xac/0x1d8) [ 29.978729] [<c04d02f8>] (sdio_irq_thread) from [<c005c724>] (kthread+0xe0/0xf4) [ 29.986511] [<c005c724>] (kthread) from [<c000f1a8>] (ret_from_fork+0x14/0x20) [ 29.994140] Code: e283300a e7942103 e3520000 0a000000 (e7f001f2) [ 30.000549] ---[ end trace 7fc618cf4aa9adbc ]--- [ 30.005401] note: ksdioirqd/mmc0[471] exited with preempt_count 1 [ 30.280792] init: tty1 main process (849) killed by TERM signal [ 32.778930] libertas_sdio mmc0:0001:1 wlan0: command 0x0010 timed out [ 32.785827] libertas_sdio mmc0:0001:1 wlan0: Timeout submitting command 0x0010
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/omap3.dtsi +0
-0@@ -417,7 +417,6 @@ mmc2: mmc@480b4000 { compatible = "ti,omap3-hsmmc"; reg = <0x480b4000 0x200>;
Quoted 9 lines
arch/arm/boot/dts/omap3.dtsi line 422
Quoted 4 lines
arch/arm/boot/dts/omap3.dtsi +0
-1- interrupts = <86>; ti,hwmods = "mmc2"; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";I think there's a patch now in mainline tree that by default tries to use interrupts-extended first, so this may not need to be changed.
I based my tests on 3.16.1, this is why I had to do this. I just tried with 3.17-rc2, same result.
Unfortunately, I do not have a lot of time to debug this issue for now, but if you have ideas, I would be happy to test.
Regards
Florian
PATCH v14 2/6 mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
In reply to Andreas FenkartAdd SDIO IRQ entries to debugfs entry. Note that PSTATE shows current state of data lines, incl. SDIO IRQ pending
drivers/mmc/host/omap_hsmmc.c +14 -3
@@ -56,6 +56,7 @@#define OMAP_HSMMC_RSP54 0x0118#define OMAP_HSMMC_RSP76 0x011C#define OMAP_HSMMC_DATA 0x0120 +#define OMAP_HSMMC_PSTATE 0x0124#define OMAP_HSMMC_HCTL 0x0128#define OMAP_HSMMC_SYSCTL 0x012C#define OMAP_HSMMC_STAT 0x0130
@@ -1815,13 +1816,23 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)struct mmc_host *mmc = s->private;struct omap_hsmmc_host *host =mmc_priv (mmc); -seq_printf (s,"mmc%d:\n ctx_loss:\t%d\n\nregs:\n" , - mmc->index, host->context_loss); +seq_printf (s,"mmc%d:\n" , mmc->index); +seq_printf (s,"sdio irq mode\t%s\n" , + (mmc->caps &MMC_CAP_SDIO_IRQ ) ?"interrupt" :"polling" ); -pm_runtime_get_sync (host->dev); +if (mmc->caps &MMC_CAP_SDIO_IRQ ) { +seq_printf (s,"sdio irq \t%s\n" , + (host->flags &HSMMC_SDIO_IRQ_ENABLED ) ?"enabled" + :"disabled" ); + } +seq_printf (s,"ctx_loss:\t%d\n" , host->context_loss); +pm_runtime_get_sync (host->dev); +seq_puts (s,"\nregs:\n" );seq_printf (s,"CON:\t\t0x%08x\n" ,OMAP_HSMMC_READ (host->base,CON )); +seq_printf (s,"PSTATE:\t\t0x%08x\n" , +OMAP_HSMMC_READ (host->base,PSTATE ));seq_printf (s,"HCTL:\t\t0x%08x\n" ,OMAP_HSMMC_READ (host->base,HCTL )); seq_printf(s, "SYSCTL:\t\t0x%08x\n",
Signature · 1 line
1.7.10.4
Re: [PATCH v14 2/6] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
Quoted 4 lines · Andreas Fenkart
Add SDIO IRQ entries to debugfs entry. Note that PSTATE shows current state of data lines, incl. SDIO IRQ pending
Signed-off-by Andreas Fenkart <[email protected]>
Thanks Andreas for fixing compilation with !CONFIG_PM[_RUNTIME],
Quoted 41 lines
drivers/mmc/host/omap_hsmmc.c +14
-3@@ -56,6 +56,7 @@#define OMAP_HSMMC_RSP54 0x0118#define OMAP_HSMMC_RSP76 0x011C#define OMAP_HSMMC_DATA 0x0120 +#define OMAP_HSMMC_PSTATE 0x0124#define OMAP_HSMMC_HCTL 0x0128#define OMAP_HSMMC_SYSCTL 0x012C#define OMAP_HSMMC_STAT 0x0130@@ -1815,13 +1816,23 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)struct mmc_host *mmc = s->private;struct omap_hsmmc_host *host =mmc_priv (mmc); -seq_printf (s,"mmc%d:\n ctx_loss:\t%d\n\nregs:\n" , - mmc->index, host->context_loss); +seq_printf (s,"mmc%d:\n" , mmc->index); +seq_printf (s,"sdio irq mode\t%s\n" , + (mmc->caps &MMC_CAP_SDIO_IRQ ) ?"interrupt" :"polling" ); -pm_runtime_get_sync (host->dev); +if (mmc->caps &MMC_CAP_SDIO_IRQ ) { +seq_printf (s,"sdio irq \t%s\n" , + (host->flags &HSMMC_SDIO_IRQ_ENABLED ) ?"enabled" + :"disabled" ); + } +seq_printf (s,"ctx_loss:\t%d\n" , host->context_loss); +pm_runtime_get_sync (host->dev); +seq_puts (s,"\nregs:\n" );seq_printf (s,"CON:\t\t0x%08x\n" ,OMAP_HSMMC_READ (host->base,CON )); +seq_printf (s,"PSTATE:\t\t0x%08x\n" , +OMAP_HSMMC_READ (host->base,PSTATE ));seq_printf (s,"HCTL:\t\t0x%08x\n" ,OMAP_HSMMC_READ (host->base,HCTL )); seq_printf(s, "SYSCTL:\t\t0x%08x\n",
PATCH v14 3/6 mmc: omap_hsmmc: enable wakeup event for sdio OMAP4
In reply to Andreas FenkartFrom: Balaji T K <[email protected]>
To detect sdio irqs properly without spurious events, OMAP4 needs IWE in CON and CTPL, CLKEXTFREE in HCTL to be set
drivers/mmc/host/omap_hsmmc.c +13 -1
@@ -94,7 +94,10 @@#define BCE (1 << 1)#define FOUR_BIT (1 << 1)#define HSPE (1 << 2) +#define IWE (1 << 24)#define DDR (1 << 19) +#define CLKEXTFREE (1 << 16) +#define CTPL (1 << 11)#define DW8 (1 << 5)#define OD 0x1#define STAT_CLEAR 0xFFFFFFFF
@@ -687,6 +690,9 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) capa =VS18 ; } +if (host->mmc->caps &MMC_CAP_SDIO_IRQ ) + hctl |=IWE ; +OMAP_HSMMC_WRITE (host->base,HCTL ,OMAP_HSMMC_READ (host->base,HCTL ) | hctl);
@@ -1684,19 +1690,23 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)static void omap_hsmmc_enable_sdio_irq (struct mmc_host *mmc,int enable) {struct omap_hsmmc_host *host =mmc_priv (mmc); -u32 irq_mask; +u32 irq_mask, con;unsigned long flags;spin_lock_irqsave (&host->irq_lock, flags); + con =OMAP_HSMMC_READ (host->base,CON ); irq_mask =OMAP_HSMMC_READ (host->base,ISE );if (enable) { host->flags |=HSMMC_SDIO_IRQ_ENABLED ; irq_mask |=CIRQ_EN ; + con |=CTPL |CLKEXTFREE ; }else { host->flags &= ~HSMMC_SDIO_IRQ_ENABLED ; irq_mask &= ~CIRQ_EN ; + con &= ~(CTPL |CLKEXTFREE ); } +OMAP_HSMMC_WRITE (host->base,CON , con);OMAP_HSMMC_WRITE (host->base,IE , irq_mask);/*
@@ -1746,6 +1756,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) goto err; } +OMAP_HSMMC_WRITE (host->base,HCTL , +OMAP_HSMMC_READ (host->base,HCTL ) |IWE );return 0 ; err:
Signature · 1 line
1.7.10.4
PATCH v14 4/6 mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected
In reply to Andreas FenkartOn multicores, an sdio irq handler could be running in parallel to runtime suspend. In the worst case it could be waiting for the spinlock held by the runtime suspend. When runtime suspend is complete and the functional clock (fclk) turned off, the irq handler will continue and cause a SIGBUS on the first register access.
drivers/mmc/host/omap_hsmmc.c +21 -2
@@ -107,6 +107,9 @@#define SRD (1 << 26)#define SOFTRESET (1 << 1) +/* PSTATE */ +#define DLEV_DAT (x) (1 << (20 + (x))) +/* Interrupt masks for IE and ISE register */ #define CC_EN (1 << 0)#define TC_EN (1 << 1)
@@ -2397,6 +2400,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev) {struct omap_hsmmc_host *host;unsigned long flags; +int ret =0 ; host =platform_get_drvdata (to_platform_device (dev));omap_hsmmc_context_save (host);
@@ -2408,14 +2412,29 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)/* disable sdio irq handling to prevent race */ OMAP_HSMMC_WRITE (host->base,ISE ,0 );OMAP_HSMMC_WRITE (host->base,IE ,0 ); -OMAP_HSMMC_WRITE (host->base,STAT ,STAT_CLEAR ); + +if (!(OMAP_HSMMC_READ (host->base,PSTATE ) &DLEV_DAT (1 ))) { +/* +* dat1 line low, pending sdio irq +* race condition: possible irq handler running on +* multi-core, abort +*/ +dev_dbg (dev,"pending sdio irq, abort suspend\n" ); +OMAP_HSMMC_WRITE (host->base,STAT ,STAT_CLEAR ); +OMAP_HSMMC_WRITE (host->base,ISE ,CIRQ_EN ); +OMAP_HSMMC_WRITE (host->base,IE ,CIRQ_EN ); +pm_runtime_mark_last_busy (dev); + ret = -EBUSY ; + goto abort; + }WARN_ON (host->flags &HSMMC_WAKE_IRQ_ENABLED );enable_irq (host->wake_irq); host->flags |=HSMMC_WAKE_IRQ_ENABLED ; } +abort:spin_unlock_irqrestore (&host->irq_lock, flags); -return 0 ; +return ret; }static int omap_hsmmc_runtime_resume (struct device *dev)
Signature · 1 line
1.7.10.4
PATCH v14 5/6 mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks
In reply to Andreas FenkartThese are predefined states of the driver model. When not present, as if not set in the device tree, they become no-ops. Explicitly selecting the default state is not needed since the device core layer sets pin mux to "default" state before probe. This is not the simplest implementation, on AM335x at least, we could switch to idle at any point in the suspend hook, only the default state needs to be set before writing to the irq registers or an IRQ might get lost.
drivers/mmc/host/omap_hsmmc.c +10 -6
@@ -1998,7 +1998,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)const struct of_device_id *match;dma_cap_mask_t mask;unsigned tx_req, rx_req; -struct pinctrl *pinctrl;const struct omap_mmc_of_data *data;void __iomem *base;
@@ -2222,11 +2221,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)omap_hsmmc_disable_irq (host); - pinctrl =devm_pinctrl_get_select_default (&pdev->dev); -if (IS_ERR (pinctrl)) -dev_warn (&pdev->dev, -"pins are not configured from the driver\n" ); -/* * For now, only support SDIO interrupt if we have a separate * wake-up interrupt configured from device tree. This is because
@@ -2428,10 +2422,15 @@ static int omap_hsmmc_runtime_suspend(struct device *dev) goto abort; } +pinctrl_pm_select_idle_state (dev); +WARN_ON (host->flags &HSMMC_WAKE_IRQ_ENABLED );enable_irq (host->wake_irq); host->flags |=HSMMC_WAKE_IRQ_ENABLED ; + }else { +pinctrl_pm_select_idle_state (dev); } + abort:spin_unlock_irqrestore (&host->irq_lock, flags);return ret;
@@ -2455,9 +2454,14 @@ static int omap_hsmmc_runtime_resume(struct device *dev) host->flags &= ~HSMMC_WAKE_IRQ_ENABLED ; } +pinctrl_pm_select_default_state (host->dev); + +/* irq lost, if pinmux incorrect */ OMAP_HSMMC_WRITE (host->base,STAT ,STAT_CLEAR );OMAP_HSMMC_WRITE (host->base,ISE ,CIRQ_EN );OMAP_HSMMC_WRITE (host->base,IE ,CIRQ_EN ); + }else { +pinctrl_pm_select_default_state (host->dev); }spin_unlock_irqrestore (&host->irq_lock, flags);return 0 ;
Signature · 1 line
1.7.10.4
PATCH v14 6/6 mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x
In reply to Andreas FenkartThe am335x can't detect pending cirq in PM runtime suspend. This patch reconfigures dat1 as a GPIO before going to suspend. SDIO interrupts are detected with the GPIO, the GPIO will only wake the module from suspend, SDIO irq detection will still happen through the IP block.
Idea of remuxing the pins by Tony Lindgren. Code contributions from Tony Lindgren and Balaji T K <[email protected]>
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +53 -0
@@ -57,3 +57,56 @@ Examples: &edma 25>; dma-names = "tx", "rx"; }; + +[workaround for missing swakeup on am33xx] + +This SOC is missing the swakeup line, it will not detect SDIO irq +while in suspend. + + ------ + | PRCM | + ------ + ^ | + swakeup | | fclk + | v + ------ ------- ----- + | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU | + ------ ------- ----- + +In suspend the fclk is off and the module is disfunctional. Even register reads +will fail. A small logic in the host will request fclk restore, when an +external event is detected. Once the clock is restored, the host detects the +event normally. Since am33xx doesn't have this line it never wakes from +suspend. + +The workaround is to reconfigure the dat1 line as a GPIO upon suspend. To make +this work, we need to set the named pinctrl states "default" and "idle". +Prepare idle to remux dat1 as a gpio, and default to remux it back as sdio +dat1. The MMC driver will then toggle between idle and default state during +runtime. + +In summary: +1. select matching 'compatible' section, see example below. +2. specify pinctrl states "default" and "idle", "sleep" is optional. +3. specify the gpio irq used for detecting sdio irq in suspend + +If configuration is incomplete, a warning message is emitted "falling back to +polling". Also check the "sdio irq mode" in /sys/kernel/debug/mmc0/regs. Mind +not every application needs SDIO irq, e.g. MMC cards. + + mmc1: mmc@48060100 { + compatible = "ti,am33xx-hsmmc"; + ... + pinctrl-names = "default", "idle", "sleep" + pinctrl-0 = <&mmc1_pins>; + pinctrl-1 = <&mmc1_idle>; + pinctrl-2 = <&mmc1_sleep>; + ... + interrupts-extended = <&intc 64 &gpio2 28 0>; + }; + + mmc1_idle : pinmux_cirq_pin { + pinctrl-single,pins = < + 0x0f8 0x3f /* GPIO2_28 */ + >; + };
drivers/mmc/host/omap_hsmmc.c +21 -3
@@ -1754,15 +1754,33 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)* and need to remux SDIO DAT1 to GPIO for wake-up from idle. */ if (host->pdata->controller_flags &OMAP_HSMMC_SWAKEUP_MISSING ) { - ret = -ENODEV ; -devm_free_irq (host->dev, host->wake_irq, host); - goto err; +struct pinctrl *p =devm_pinctrl_get (host->dev); +if (!p) { + ret = -ENODEV ; + goto err_free_irq; + } +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_DEFAULT ))) { +dev_info (host->dev,"missing default pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } + +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_IDLE ))) { +dev_info (host->dev,"missing idle pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } +devm_pinctrl_put (p); }OMAP_HSMMC_WRITE (host->base,HCTL ,OMAP_HSMMC_READ (host->base,HCTL ) |IWE );return 0 ; +err_free_irq: +devm_free_irq (host->dev, host->wake_irq, host); err:dev_warn (host->dev,"no SDIO IRQ support, falling back to polling\n" ); host->wake_irq =0 ;
Signature · 1 line
1.7.10.4
Re: [PATCH v14 6/6] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x
Quoted 11 lines · Andreas Fenkart
The am335x can't detect pending cirq in PM runtime suspend. This patch reconfigures dat1 as a GPIO before going to suspend. SDIO interrupts are detected with the GPIO, the GPIO will only wake the module from suspend, SDIO irq detection will still happen through the IP block.
Idea of remuxing the pins by Tony Lindgren. Code contributions from Tony Lindgren and Balaji T K <[email protected]>
Signed-off-by Andreas Fenkart <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Hi Chris/Ulf,
Can you please queue this series for 3.16
Thanks and Regards,
Balaji T K
Quoted 104 lines
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +53
-0@@ -57,3 +57,56 @@ Examples: &edma 25>; dma-names = "tx", "rx"; }; + +[workaround for missing swakeup on am33xx] + +This SOC is missing the swakeup line, it will not detect SDIO irq +while in suspend. + + ------ + | PRCM | + ------ + ^ | + swakeup | | fclk + | v + ------ ------- ----- + | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU | + ------ ------- ----- + +In suspend the fclk is off and the module is disfunctional. Even register reads +will fail. A small logic in the host will request fclk restore, when an +external event is detected. Once the clock is restored, the host detects the +event normally. Since am33xx doesn't have this line it never wakes from +suspend. + +The workaround is to reconfigure the dat1 line as a GPIO upon suspend. To make +this work, we need to set the named pinctrl states "default" and "idle". +Prepare idle to remux dat1 as a gpio, and default to remux it back as sdio +dat1. The MMC driver will then toggle between idle and default state during +runtime. + +In summary: +1. select matching 'compatible' section, see example below. +2. specify pinctrl states "default" and "idle", "sleep" is optional. +3. specify the gpio irq used for detecting sdio irq in suspend + +If configuration is incomplete, a warning message is emitted "falling back to +polling". Also check the "sdio irq mode" in /sys/kernel/debug/mmc0/regs. Mind +not every application needs SDIO irq, e.g. MMC cards. + + mmc1: mmc@48060100 { + compatible = "ti,am33xx-hsmmc"; + ... + pinctrl-names = "default", "idle", "sleep" + pinctrl-0 = <&mmc1_pins>; + pinctrl-1 = <&mmc1_idle>; + pinctrl-2 = <&mmc1_sleep>; + ... + interrupts-extended = <&intc 64 &gpio2 28 0>; + }; + + mmc1_idle : pinmux_cirq_pin { + pinctrl-single,pins = < + 0x0f8 0x3f /* GPIO2_28 */ + >; + };drivers/mmc/host/omap_hsmmc.c +21
-3@@ -1754,15 +1754,33 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)* and need to remux SDIO DAT1 to GPIO for wake-up from idle. */ if (host->pdata->controller_flags &OMAP_HSMMC_SWAKEUP_MISSING ) { - ret = -ENODEV ; -devm_free_irq (host->dev, host->wake_irq, host); - goto err; +struct pinctrl *p =devm_pinctrl_get (host->dev); +if (!p) { + ret = -ENODEV ; + goto err_free_irq; + } +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_DEFAULT ))) { +dev_info (host->dev,"missing default pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } + +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_IDLE ))) { +dev_info (host->dev,"missing idle pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } +devm_pinctrl_put (p); }OMAP_HSMMC_WRITE (host->base,HCTL ,OMAP_HSMMC_READ (host->base,HCTL ) |IWE );return 0 ; +err_free_irq: +devm_free_irq (host->dev, host->wake_irq, host); err:dev_warn (host->dev,"no SDIO IRQ support, falling back to polling\n" ); host->wake_irq =0 ;
Re: [PATCH v14 6/6] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x
Quoted 10 lines · Balaji T K
Quoted 9 lines · Andreas Fenkart
The am335x can't detect pending cirq in PM runtime suspend. This patch reconfigures dat1 as a GPIO before going to suspend. SDIO interrupts are detected with the GPIO, the GPIO will only wake the module from suspend, SDIO irq detection will still happen through the IP block.
Idea of remuxing the pins by Tony Lindgren. Code contributions from Tony Lindgren and Balaji T K <[email protected]>
Quoted 8 lines
Quoted 2 lines
Signed-off-by Andreas Fenkart <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Acked-by Balaji T K <[email protected]>Hi Chris/Ulf,
Can you please queue this series for 3.16
Yes please, not seeing these in linux next yet.
Regards,
Tony
Quoted 104 lines
Quoted 103 lines
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +53
-0@@ -57,3 +57,56 @@ Examples: &edma 25>; dma-names = "tx", "rx"; }; + +[workaround for missing swakeup on am33xx] + +This SOC is missing the swakeup line, it will not detect SDIO irq +while in suspend. + + ------ + | PRCM | + ------ + ^ | + swakeup | | fclk + | v + ------ ------- ----- + | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU | + ------ ------- ----- + +In suspend the fclk is off and the module is disfunctional. Even register reads +will fail. A small logic in the host will request fclk restore, when an +external event is detected. Once the clock is restored, the host detects the +event normally. Since am33xx doesn't have this line it never wakes from +suspend. + +The workaround is to reconfigure the dat1 line as a GPIO upon suspend. To make +this work, we need to set the named pinctrl states "default" and "idle". +Prepare idle to remux dat1 as a gpio, and default to remux it back as sdio +dat1. The MMC driver will then toggle between idle and default state during +runtime. + +In summary: +1. select matching 'compatible' section, see example below. +2. specify pinctrl states "default" and "idle", "sleep" is optional. +3. specify the gpio irq used for detecting sdio irq in suspend + +If configuration is incomplete, a warning message is emitted "falling back to +polling". Also check the "sdio irq mode" in /sys/kernel/debug/mmc0/regs. Mind +not every application needs SDIO irq, e.g. MMC cards. + + mmc1: mmc@48060100 { + compatible = "ti,am33xx-hsmmc"; + ... + pinctrl-names = "default", "idle", "sleep" + pinctrl-0 = <&mmc1_pins>; + pinctrl-1 = <&mmc1_idle>; + pinctrl-2 = <&mmc1_sleep>; + ... + interrupts-extended = <&intc 64 &gpio2 28 0>; + }; + + mmc1_idle : pinmux_cirq_pin { + pinctrl-single,pins = < + 0x0f8 0x3f /* GPIO2_28 */ + >; + };drivers/mmc/host/omap_hsmmc.c +21
-3@@ -1754,15 +1754,33 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)* and need to remux SDIO DAT1 to GPIO for wake-up from idle. */ if (host->pdata->controller_flags &OMAP_HSMMC_SWAKEUP_MISSING ) { - ret = -ENODEV ; -devm_free_irq (host->dev, host->wake_irq, host); - goto err; +struct pinctrl *p =devm_pinctrl_get (host->dev); +if (!p) { + ret = -ENODEV ; + goto err_free_irq; + } +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_DEFAULT ))) { +dev_info (host->dev,"missing default pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } + +if (IS_ERR (pinctrl_lookup_state (p,PINCTRL_STATE_IDLE ))) { +dev_info (host->dev,"missing idle pinctrl state\n" ); +devm_pinctrl_put (p); + ret = -EINVAL ; + goto err_free_irq; + } +devm_pinctrl_put (p); }OMAP_HSMMC_WRITE (host->base,HCTL ,OMAP_HSMMC_READ (host->base,HCTL ) |IWE );return 0 ; +err_free_irq: +devm_free_irq (host->dev, host->wake_irq, host); err:dev_warn (host->dev,"no SDIO IRQ support, falling back to polling\n" ); host->wake_irq =0 ;
Ulf Hansson
AppliedQuoted 10 lines · Andreas Fenkart
Hi Balaji, Tony, Ulf, all
v14
- drop all ifdef/endif introduced by v13
-- rely onpinctrl_lookup_stateto prevent ifdefCONFIG_PM-- benefit: all code is compile tested no matter the configuration -- drawback: require wake_irq/pinctrl configuration even when
runtime suspend is not configured
- drop runtime state from debugfs output
- rebased onto current mmc-next06732b84b4cf
Thanks! Applied for next.
Kind regards
Ulf Hansson
Quoted 99 lines
v13
- fix compile breaks if !CONFIG_PM
- additional patch: install dummy pm runtime hooks if !CONFIG_PM_RUNTIMEv12
- drop !CONFIG_OF compile break only exists when
#undefCONFIG_OFafter include headers 1/7(Sebastian Reichel)
- do not emit "falling back to polling" ifwake_irqnot specified since MMC does not need it, and it might confuse users only emit if pinmux default/idle is not present or claiming the irq failed 2/7(Balaji)
- dropped out-of-tree patches 6/7(Balaji)
- mention "ti,am33xx-hsmmc" compatible section in bindings documentation 1/5v11
- split !CONFIG_OF compile break into separate patch
- enable IWE/CLKEXTFREE in CON/HCTL register needed for omap4
- '&' vs '&&' inomap_hsmmc_resume, 1/5 (Andreas Müller)
- #defineDLEV_DATinstead of BIT(21) 2/5 (Balaji)
-pinctrl_pm_select_default_state()removed, 4/5 (Balaji)
- drop _irqsave/_irqrestore fromomap_hsmmc_wake_irqhandler since it can't be preempted by same priorityomap_hsmmc_irqhandler 1/5(Joel Fernandes)
- replacedevres_open_groupby explicitdevm_freecalls 1/5 (Balaji)
-disable_irq_nosyncwake_irqsince we handle it thread safe 1/5 (Balaji)
- drop 'gpio_dat1' pinctrl states and rework documentation 5/5 (Balaji)v10
- bug fix on multi-core, untested
- incorporated changes from Balaji
- use devres / RAII mechanism to configurewake_up/ sdio irq capabilities
- drop pinctrl state 'active'
rely on driver-model states 'default', 'idle'
- add specific 'gpio_dat1' state for am335x SWAKEUP hack
- reorganized patches; +1 patch multi-core bugfix / +1 for pinctrl
- rebased455c6fdbd21916/ cherry-picks from mmc-nextv9
- extended comment about why wake-irq is needed
- drop double '(' ')' aroundcard_detect_irq
- drop final '.' in in subject line of patchv8
- rebased on top of Tony Lindgren<[email protected]> changes
- improved changelog describing the earlier work
- improved wakeup irq setup
- works for am3730 es platform now
- my changes on top:
- compile tested with #undefCONFIG_OF
- disablewake_irqin handler to prevent infinite loop
- fixed typo and added comment about wake-irqv7
- rebase on 3.14.0-rc3-49726-g77e15ec
- splitomap_hsmmc_pin_initdue to regression on omap-3730 platformv6
- rebase on Linux 3.13-rc3
- reformatting debugfsv5
- fix compile error introduced by last minute one line fixv4:
- switch to interrupts-extended format
- drop ti,swakeup-missing flag convert to comaptible sectionv3:
- removedgpio_irqfromplatform_datav2:
- incorparated changes as suggested by reviewers
- simplified workaround for am335x, gpio will now only wake the module from runtime suspend, not handle the sdio irq itselfAndreas Fenkart (6):
mmc:omap_hsmmc: Enable SDIO interrupt
mmc:omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
mmc:omap_hsmmc: enable wakeup event for sdio OMAP4
mmc:omap_hsmmc: abort runtime suspend if pending sdio irq detected
mmc:omap_hsmmc: switch default/idle pinctrl states in runtime hooks
mmc:omap_hsmmc: Pin remux workaround to support SDIO interrupt onAM335x.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ drivers/mmc/host/omap_hsmmc.c | 283 ++++++++++++++++++-- include/linux/platform_data/mmc-omap.h | 1 + 3 files changed, 317 insertions(+), 21 deletions(-)--
1.7.10.4--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
I did not find this patch set in Chris MMC tree.
I did succeed to locate it in Linaro repo only.
When it will be merged in the mainline?
We are using SDIO IRQ patch with OMAP5 board and it is really useful.
Andreas, thank you.
Regards,
Dmitry
Quoted 122 lines · Ulf Hansson
Quoted 10 lines · Andreas Fenkart
Hi Balaji, Tony, Ulf, all
v14
- drop all ifdef/endif introduced by v13
-- rely onpinctrl_lookup_stateto prevent ifdefCONFIG_PM-- benefit: all code is compile tested no matter the configuration -- drawback: require wake_irq/pinctrl configuration even when
runtime suspend is not configured
- drop runtime state from debugfs output
- rebased onto current mmc-next06732b84b4cfThanks! Applied for next.
Kind regards
Ulf HanssonQuoted 92 lines
v13
- fix compile breaks if !CONFIG_PM
- additional patch: install dummy pm runtime hooks if !CONFIG_PM_RUNTIMEv12
- drop !CONFIG_OF compile break only exists when
#undefCONFIG_OFafter include headers 1/7(Sebastian Reichel)
- do not emit "falling back to polling" ifwake_irqnot specified since MMC does not need it, and it might confuse users only emit if pinmux default/idle is not present or claiming the irq failed 2/7(Balaji)
- dropped out-of-tree patches 6/7(Balaji)
- mention "ti,am33xx-hsmmc" compatible section in bindings documentation 1/5v11
- split !CONFIG_OF compile break into separate patch
- enable IWE/CLKEXTFREE in CON/HCTL register needed for omap4
- '&' vs '&&' inomap_hsmmc_resume, 1/5 (Andreas Müller)
- #defineDLEV_DATinstead of BIT(21) 2/5 (Balaji)
-pinctrl_pm_select_default_state()removed, 4/5 (Balaji)
- drop _irqsave/_irqrestore fromomap_hsmmc_wake_irqhandler since it can't be preempted by same priorityomap_hsmmc_irqhandler 1/5(Joel Fernandes)
- replacedevres_open_groupby explicitdevm_freecalls 1/5 (Balaji)
-disable_irq_nosyncwake_irqsince we handle it thread safe 1/5 (Balaji)
- drop 'gpio_dat1' pinctrl states and rework documentation 5/5 (Balaji)v10
- bug fix on multi-core, untested
- incorporated changes from Balaji
- use devres / RAII mechanism to configurewake_up/ sdio irq capabilities
- drop pinctrl state 'active'
rely on driver-model states 'default', 'idle'
- add specific 'gpio_dat1' state for am335x SWAKEUP hack
- reorganized patches; +1 patch multi-core bugfix / +1 for pinctrl
- rebased455c6fdbd21916/ cherry-picks from mmc-nextv9
- extended comment about why wake-irq is needed
- drop double '(' ')' aroundcard_detect_irq
- drop final '.' in in subject line of patchv8
- rebased on top of Tony Lindgren<[email protected]> changes
- improved changelog describing the earlier work
- improved wakeup irq setup
- works for am3730 es platform now
- my changes on top:
- compile tested with #undefCONFIG_OF
- disablewake_irqin handler to prevent infinite loop
- fixed typo and added comment about wake-irqv7
- rebase on 3.14.0-rc3-49726-g77e15ec
- splitomap_hsmmc_pin_initdue to regression on omap-3730 platformv6
- rebase on Linux 3.13-rc3
- reformatting debugfsv5
- fix compile error introduced by last minute one line fixv4:
- switch to interrupts-extended format
- drop ti,swakeup-missing flag convert to comaptible sectionv3:
- removedgpio_irqfromplatform_datav2:
- incorparated changes as suggested by reviewers
- simplified workaround for am335x, gpio will now only wake the module from runtime suspend, not handle the sdio irq itselfAndreas Fenkart (6):
mmc:omap_hsmmc: Enable SDIO interrupt
mmc:omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
mmc:omap_hsmmc: enable wakeup event for sdio OMAP4
mmc:omap_hsmmc: abort runtime suspend if pending sdio irq detected
mmc:omap_hsmmc: switch default/idle pinctrl states in runtime hooks
mmc:omap_hsmmc: Pin remux workaround to support SDIO interrupt onAM335x.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ drivers/mmc/host/omap_hsmmc.c | 283 ++++++++++++++++++-- include/linux/platform_data/mmc-omap.h | 1 + 3 files changed, 317 insertions(+), 21 deletions(-)Quoted 7 lines
--
1.7.10.4--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html