From patchwork Wed Feb 25 18:11:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5882251 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 2CE96BF440 for ; Wed, 25 Feb 2015 18:12:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BC262028D for ; Wed, 25 Feb 2015 18:12:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72DA020353 for ; Wed, 25 Feb 2015 18:12:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbbBYSMK (ORCPT ); Wed, 25 Feb 2015 13:12:10 -0500 Received: from mail-ig0-f177.google.com ([209.85.213.177]:55796 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752450AbbBYSMI (ORCPT ); Wed, 25 Feb 2015 13:12:08 -0500 Received: by mail-ig0-f177.google.com with SMTP id z20so7976210igj.4 for ; Wed, 25 Feb 2015 10:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YBOPYWCOK6VNYQafW758ppHkXggj6bkxqbwxnT2jP4E=; b=imSz8QUZdswzmaRAg57OQjk/VMMiGmuPsUu5cWD6X9eEsrse4bc+XNujYzG2offYuL QtVpQm6Uq6Bf2czKQ4BjyFMm2xR/K8hNUz9tkI+U6dmpYP7MARNj50Yoez4dz31jtIkT lDXvWOyNa7bXuTqlg+MHvY2pt9eYiWK5PKfxU= 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:in-reply-to :references; bh=YBOPYWCOK6VNYQafW758ppHkXggj6bkxqbwxnT2jP4E=; b=d+eNCAu2dMb3Vf7w/MNwlpM73VbFPByqTnurFOvhm5mVXNi1EmEPTId05OAjNnmT4C R+LyKU3qc3yv2lIWiKntcxno12RvXQ4DFA4pMj17wQxFGhTfSqiSzC7DMGoJjpQgDdZ7 8uxvZf+xDDIvIFMYe1tA+/nRn5GAmeN8DRFIwCNjvWm57/HOxCZTKo/7rZkjovvoVRV2 cwrtsd8PSazJbgXa3nrAUHwTE3a6P7ohawK4UcuHLAHfcWCHpkr7f/gbRauhLrHpTzDS cNsbT7jD0vMphStFT6GZy7nwd9nrvHYDXU2vAaOQ/2g/ohnCNV/0ET6KAsTagZNT2+P6 i8GQ== X-Gm-Message-State: ALoCoQnfz69OeUJG6pqK7tUX9J1NRfc02DaKO0D24JbnqEao6hPfnw86HRo8XcC+nFLSx6UorcKp X-Received: by 10.50.131.196 with SMTP id oo4mr6514806igb.2.1424887927372; Wed, 25 Feb 2015 10:12:07 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id i16sm11972202ioe.17.2015.02.25.10.12.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 10:12:06 -0800 (PST) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Cc: Alim Akhtar , Sonny Rao , Andrew Bresticker , Heiko Stuebner , Addy Ke , Alexandru Stan , 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 2/2] mmc: dw_mmc: Don't crash if we get an interrupt before slot has initted Date: Wed, 25 Feb 2015 10:11:52 -0800 Message-Id: <1424887912-20015-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1424887912-20015-1-git-send-email-dianders@chromium.org> References: <1424887912-20015-1-git-send-email-dianders@chromium.org> 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 It's unlikely that this is really needed on any single-slot systems where we disable card detects until the end of probe, but it still seems safer to check to make sure that a slot has been initted before we try to dereference it to find the SDIO interrupt mask. Signed-off-by: Doug Anderson Tested-by: Javier Martinez Canillas --- drivers/mmc/host/dw_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 8df2a92..1c909ad 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2156,6 +2156,10 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) /* Handle SDIO Interrupts */ for (i = 0; i < host->num_slots; i++) { struct dw_mci_slot *slot = host->slot[i]; + + if (!slot) + continue; + if (pending & SDMMC_INT_SDIO(slot->sdio_id)) { mci_writel(host, RINTSTS, SDMMC_INT_SDIO(slot->sdio_id));