From patchwork Wed Mar 11 22:15:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 5988931 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8FB5FBF910 for ; Wed, 11 Mar 2015 22:16:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C02E420395 for ; Wed, 11 Mar 2015 22:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D16CC202FF for ; Wed, 11 Mar 2015 22:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752856AbbCKWQF (ORCPT ); Wed, 11 Mar 2015 18:16:05 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:35770 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752261AbbCKWQC (ORCPT ); Wed, 11 Mar 2015 18:16:02 -0400 Received: by ieclw3 with SMTP id lw3so2381586iec.2 for ; Wed, 11 Mar 2015 15:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=Dgad6L+BMk+DqBeOSfizr0jZbrKXegVkIDjQJUrUqo4=; b=a3UerZYspOcYjU5OnUCaxd+dvCe2nKiyPCdIreQ+Ww+U3u26ygJkVgMDQ2TzOYated IhQ0bAOsAH3uw7UP8W9psr7R+EayUcuTKj1MC/r7PLj83eqSNXkfhSQ2lBDFjEKpp0k0 +ABXvtFGdCRMu6uu4Aa5Z5UaVXFdmIoDrZq9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Dgad6L+BMk+DqBeOSfizr0jZbrKXegVkIDjQJUrUqo4=; b=lVN0ZyScbmveGlVu5b8+/maPLRW6O+tquGHPyrn7UHRfr29MqpmCtJ5kVogP885kZC GfIYjTi9OXZ8QOJAHflFLTglROAuuWHAucpw7tg1vByorZOGOMblNYB3hAbbCRfXMpuC QjLya5L1TBd3k9S8XDjOrpZpJ9bLhXGPT5NFo6HqiPDc3/AB8k33/tgzUczZOH+kZdVY lKK/eHuP7XeT8c5cpEhYzu43VPY+oGsQkgGkOk8D14+aDtI4DI3+f+kOGKm7beHPCpgC 3Lx5KkkjUjzvJWpv5bHNuXDrOSBHkfcmFxqbHsThgSwk1BRJDMUKVM5EJgHHVvqWJx+J TB2g== X-Gm-Message-State: ALoCoQloGhbkP1uvDTqHyRX4LfyuqlkW9fG6I/4mU0niloo8wtT71fivRk4J5Ug2lOlCXo5EaPZg X-Received: by 10.50.97.41 with SMTP id dx9mr94308558igb.1.1426112136335; Wed, 11 Mar 2015 15:15:36 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id 192sm3229684ioo.38.2015.03.11.15.15.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Mar 2015 15:15:35 -0700 (PDT) From: Doug Anderson To: Ulf Hansson , Heiko Stuebner , Jaehoon Chung , Seungwon Jeon Cc: Mark Brown , Alexandru Stan , Alim Akhtar , Sonny Rao , Andrew Bresticker , Addy Ke , javier.martinez@collabora.co.uk, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Doug Anderson , 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 Message-Id: <1426112117-18220-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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");