From: Doug Anderson <dianders@chromium.org> To: Ulf Hansson <ulf.hansson@linaro.org>, Heiko Stuebner <heiko@sntech.de>, Jaehoon Chung <jh80.chung@samsung.com>, Seungwon Jeon <tgih.jun@samsung.com> Cc: Mark Brown <broonie@kernel.org>, Alexandru Stan <amstan@chromium.org>, Alim Akhtar <alim.akhtar@samsung.com>, Sonny Rao <sonnyrao@chromium.org>, Andrew Bresticker <abrestic@chromium.org>, Addy Ke <addy.ke@rock-chips.com>, javier.martinez@collabora.co.uk, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Doug Anderson <dianders@chromium.org>, chris@printf.net, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/4] mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring Date: Wed, 11 Mar 2015 15:15:14 -0700 [thread overview] Message-ID: <1426112117-18220-1-git-send-email-dianders@chromium.org> (raw) If dw_mci_init_slot() returns that we got a probe deferral then it may leave slot->mmc as NULL. That will cause dw_mci_enable_cd() to crash when it calls mmc_gpio_get_cd(). Fix this by moving the call of dw_mci_enable_cd() until we're sure that we're good. Note that if we have more than one slot and one defers (but the others don't) things won't work so well. ...but that's not a new thing and everyone has already agreed that multislot support ought to be removed from dw_mmc eventually anyway since it is unused, untested, and you can see several bugs like this by inspecting the code. Fixes: bcafaf5470f0 ("mmc: dw_mmc: Only enable CD after setup and only if needed") Signed-off-by: Doug Anderson <dianders@chromium.org> --- Changes in v4: - Defer vs. card detect fix patch new for v4. Changes in v3: None Changes in v2: None drivers/mmc/host/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 47dfd0e..e2811cf 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2863,9 +2863,6 @@ int dw_mci_probe(struct dw_mci *host) init_slots++; } - /* Now that slots are all setup, we can enable card detect */ - dw_mci_enable_cd(host); - if (init_slots) { dev_info(host->dev, "%d slots initialized\n", init_slots); } else { @@ -2874,6 +2871,9 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; } + /* Now that slots are all setup, we can enable card detect */ + dw_mci_enable_cd(host); + if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n"); -- 2.2.0.rc0.207.ga3a616c
WARNING: multiple messages have this Message-ID (diff)
From: dianders@chromium.org (Doug Anderson) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/4] mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring Date: Wed, 11 Mar 2015 15:15:14 -0700 [thread overview] Message-ID: <1426112117-18220-1-git-send-email-dianders@chromium.org> (raw) If dw_mci_init_slot() returns that we got a probe deferral then it may leave slot->mmc as NULL. That will cause dw_mci_enable_cd() to crash when it calls mmc_gpio_get_cd(). Fix this by moving the call of dw_mci_enable_cd() until we're sure that we're good. Note that if we have more than one slot and one defers (but the others don't) things won't work so well. ...but that's not a new thing and everyone has already agreed that multislot support ought to be removed from dw_mmc eventually anyway since it is unused, untested, and you can see several bugs like this by inspecting the code. Fixes: bcafaf5470f0 ("mmc: dw_mmc: Only enable CD after setup and only if needed") Signed-off-by: Doug Anderson <dianders@chromium.org> --- Changes in v4: - Defer vs. card detect fix patch new for v4. Changes in v3: None Changes in v2: None drivers/mmc/host/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 47dfd0e..e2811cf 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2863,9 +2863,6 @@ int dw_mci_probe(struct dw_mci *host) init_slots++; } - /* Now that slots are all setup, we can enable card detect */ - dw_mci_enable_cd(host); - if (init_slots) { dev_info(host->dev, "%d slots initialized\n", init_slots); } else { @@ -2874,6 +2871,9 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; } + /* Now that slots are all setup, we can enable card detect */ + dw_mci_enable_cd(host); + if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n"); -- 2.2.0.rc0.207.ga3a616c
next reply other threads:[~2015-03-11 22:16 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-11 22:15 Doug Anderson [this message] 2015-03-11 22:15 ` [PATCH v4 1/4] mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring Doug Anderson 2015-03-11 22:15 ` [PATCH v4 2/4] mmc: core: Add mmc_regulator_set_vqmmc() Doug Anderson 2015-03-11 22:15 ` Doug Anderson 2015-03-16 14:05 ` Ulf Hansson 2015-03-16 14:05 ` Ulf Hansson 2015-03-16 14:05 ` Ulf Hansson 2015-03-16 15:12 ` Doug Anderson 2015-03-16 15:12 ` Doug Anderson 2015-03-16 15:12 ` Doug Anderson 2015-03-17 10:23 ` Ulf Hansson 2015-03-17 10:23 ` Ulf Hansson 2015-03-17 10:23 ` Ulf Hansson 2015-03-17 10:38 ` Mark Brown 2015-03-17 10:38 ` Mark Brown 2015-03-17 10:38 ` Mark Brown 2015-03-17 11:28 ` Ulf Hansson 2015-03-17 11:28 ` Ulf Hansson 2015-03-17 11:28 ` Ulf Hansson 2015-03-19 4:09 ` Doug Anderson 2015-03-19 4:09 ` Doug Anderson 2015-03-19 4:09 ` Doug Anderson 2015-03-19 4:09 ` Doug Anderson 2015-03-19 11:14 ` Ulf Hansson 2015-03-19 11:14 ` Ulf Hansson 2015-03-19 11:14 ` Ulf Hansson 2015-03-19 11:36 ` Mark Brown 2015-03-19 11:36 ` Mark Brown 2015-03-19 11:36 ` Mark Brown 2015-03-20 10:55 ` Ulf Hansson 2015-03-20 10:55 ` Ulf Hansson 2015-03-20 10:55 ` Ulf Hansson 2015-03-20 11:28 ` Mark Brown 2015-03-20 11:28 ` Mark Brown 2015-03-20 11:28 ` Mark Brown 2015-04-07 20:05 ` Doug Anderson 2015-04-07 20:05 ` Doug Anderson 2015-04-07 20:05 ` Doug Anderson 2015-04-08 11:28 ` Mark Brown 2015-04-08 11:28 ` Mark Brown 2015-04-08 11:28 ` Mark Brown 2015-03-11 22:15 ` [PATCH v4 3/4] mmc: dw_mmc: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch Doug Anderson 2015-03-11 22:15 ` Doug Anderson 2015-03-11 22:15 ` [PATCH v4 4/4] ARM: dts: Specify VMMC and VQMMC on rk3288-evb Doug Anderson 2015-03-11 22:15 ` Doug Anderson 2015-03-11 22:15 ` Doug Anderson 2015-03-11 23:30 ` Heiko Stuebner 2015-03-11 23:30 ` Heiko Stuebner 2015-04-07 21:37 ` Heiko Stübner 2015-04-07 21:37 ` Heiko Stübner 2015-03-13 11:32 ` [PATCH v4 1/4] mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring Jaehoon Chung 2015-03-13 11:32 ` Jaehoon Chung 2015-03-13 12:10 ` Heiko Stuebner 2015-03-13 12:10 ` Heiko Stuebner 2015-03-13 12:10 ` Heiko Stuebner 2015-03-16 2:09 ` Jaehoon Chung 2015-03-16 2:09 ` Jaehoon Chung 2015-03-27 5:55 ` Jaehoon Chung 2015-03-27 5:55 ` Jaehoon Chung 2015-03-27 15:46 ` Doug Anderson 2015-03-27 15:46 ` Doug Anderson 2015-03-27 15:46 ` Doug Anderson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1426112117-18220-1-git-send-email-dianders@chromium.org \ --to=dianders@chromium.org \ --cc=abrestic@chromium.org \ --cc=addy.ke@rock-chips.com \ --cc=alim.akhtar@samsung.com \ --cc=amstan@chromium.org \ --cc=broonie@kernel.org \ --cc=chris@printf.net \ --cc=heiko@sntech.de \ --cc=javier.martinez@collabora.co.uk \ --cc=jh80.chung@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=sonnyrao@chromium.org \ --cc=tgih.jun@samsung.com \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.