From patchwork Fri Aug 4 17:43:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9881847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43B14602B8 for ; Fri, 4 Aug 2017 17:47:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 231852891B for ; Fri, 4 Aug 2017 17:47:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1666528930; Fri, 4 Aug 2017 17:47:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A57FB2891B for ; Fri, 4 Aug 2017 17:47:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbdHDRrB (ORCPT ); Fri, 4 Aug 2017 13:47:01 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38758 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752986AbdHDRoG (ORCPT ); Fri, 4 Aug 2017 13:44:06 -0400 Received: by mail-wm0-f52.google.com with SMTP id m85so25461659wma.1 for ; Fri, 04 Aug 2017 10:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sZmBv5v/k9+o7CRk6RZUQ+pl83BsvWTxZsuM2Q6vDfg=; b=r9HGhP98oogJL+k34wTG0KXqZ8pkNxvk93oPfathNejaLXS3lvUBsK5tQa49B0EDpF wJ2eMOqbaTv0h3lf4y9OYw+yKehK0D2KnczrAmEFSytNodg+s32fMVfcuqIhun/ZczqK Q9i7i56NA4vcMRZn7xtY+hgsH/ttYQehyujZfc29wD+QahnpALVAWh913LSF80crvOox WCF+jeEFAdQceIKFBljMSXFKY28DJwKQWEkTlhg/6rp7lo3pyNoTg4pBzP+l5ti+S+ln vMVGepD7bELJreNnwX63HOaLINMTE8j24nh0UhWBzXYppyDRlvYRAWUJ9bL/oS/9fD4a HoUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sZmBv5v/k9+o7CRk6RZUQ+pl83BsvWTxZsuM2Q6vDfg=; b=L0tdPUFZNxUlNtkehRrIQ3YHyreyS+OQo134/z8cKs/cl5qfiqfPzDIIEQpMP1EmXz fqXL5GLL22GDe/yZywdIiUHQ78Q1MtTFvih7ams+d42exbBpZBjLfQtt3qGzNUa1vgZN PWpQNWXhpHhePH5AtQmIJz0NFfTnxI2m8lf2BfZHirBlsHge0nT3Kg24nNEMJAF71sUU VPHUJ1ChFkqzmoWgMls+TICAJg+aCKylnRVT9XHxOGpCgnDA2d9htMc0StWxb192e3Tm ILQeTjbTBWchPevZBzBWqp6+FNCIlMLe16m82CzWUfzsJjYvSBzNYUuiGm3+YwhlrJMi 8OBg== X-Gm-Message-State: AHYfb5iYV/uxTza5Uy+snz3xKavwy+oPOfdaaIC2hjUzxeBusptH/YE+ oE5qhbXXPy6T+pHR X-Received: by 10.28.100.136 with SMTP id y130mr2223693wmb.60.1501868645128; Fri, 04 Aug 2017 10:44:05 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id p17sm996082wma.45.2017.08.04.10.44.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 10:44:04 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/14] mmc: meson-gx: use _irqsave variant of spinlock Date: Fri, 4 Aug 2017 19:43:43 +0200 Message-Id: <20170804174353.16486-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170804174353.16486-1-jbrunet@baylibre.com> References: <20170804174353.16486-1-jbrunet@baylibre.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP spinlock used in interrupt handler should use the _irqsave variant Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms") Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 8a74a048db88..a399fbd415f4 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -727,6 +727,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) struct mmc_command *cmd; struct mmc_data *data; u32 irq_en, status, raw_status; + unsigned long flag; irqreturn_t ret = IRQ_HANDLED; if (WARN_ON(!host)) @@ -739,7 +740,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) data = cmd->data; - spin_lock(&host->lock); + spin_lock_irqsave(&host->lock, flag); irq_en = readl(host->regs + SD_EMMC_IRQ_EN); raw_status = readl(host->regs + SD_EMMC_STATUS); status = raw_status & irq_en; @@ -806,7 +807,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) if (ret == IRQ_HANDLED) meson_mmc_request_done(host->mmc, cmd->mrq); - spin_unlock(&host->lock); + spin_unlock_irqrestore(&host->lock, flag); return ret; }