From patchwork Wed Feb 1 06:48:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9548943 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 53A1260415 for ; Wed, 1 Feb 2017 06:49:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4503A27E3E for ; Wed, 1 Feb 2017 06:49:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39F362811C; Wed, 1 Feb 2017 06:49:54 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 3305F27E3E for ; Wed, 1 Feb 2017 06:49:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751369AbdBAGtw (ORCPT ); Wed, 1 Feb 2017 01:49:52 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34344 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbdBAGtv (ORCPT ); Wed, 1 Feb 2017 01:49:51 -0500 Received: by mail-wm0-f68.google.com with SMTP id c85so3600210wmi.1 for ; Tue, 31 Jan 2017 22:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=8+tOstDnx4oVEMCyDmMvUfa0JWUr0/WSfYK7PHRlvdg=; b=cw3a+P/ylWcPs7fQDrzNs00rlDRWOh7F34keuT24MGovW4c6Dd7leUYAAeLTTe7EdG DGGwf7Fz3cRNeyVt+7BsniMgXLRQiqn0V01+fwJGPxLLlcPQice4Q6E6mH5QEO1fEkiW HHskE2GvrNGAj0p8OcJXyw4qJ2ExrRJong2ffKHstVVVQQjZGuv/8iSevxgpbLYuLCAt CFodSYuH4mCn8WSl1FgR9Nc2VMmk+JVeAy4cSJZ8UpLq/uN/C4CNcDH7j76tTvaAbdW3 vyMUwYUVSKVnMamEYZY/PwWXAQCCNen93H3+/X2iWDB/b9pi8QM2KnP4BX+TB8AtUQZI 7haw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=8+tOstDnx4oVEMCyDmMvUfa0JWUr0/WSfYK7PHRlvdg=; b=WnOxdDQ0zUtaV33YUTR7Wlb9nPEvHDecSxz6enRKubLgmiJm4in4jO+2eWUG+24jLW jIe9lN+StiGX6dyJfo8RPZoQ+VGDmthNoo/DjXgwSdEMXSsFpgfahbaMWXBfyyWUw0G3 MSJW0fVcIMWibMYxYbSi6xf+HimAQgjDAfE+6v/GAKr41Vb9gp1F5AKTdo8dMmAkXYBg R2E9uNoewfoXZsDqR+BQSVssdpf10YWdVLvlRulKmBTG8coj1xXjkv8oKsPTNGJuYlGR 9rx3FK8yibt68W8pLs8U2xC1zPnV8f13jg5NSO9KP6p0rlNVGUacOeLnvlXqtV7YiIpJ sGYQ== X-Gm-Message-State: AIkVDXLcp4aTyd0dNwEaB6OvI+JPZsMMsP2PJKMlgNB1bTZ2Ju/G+FD+Q1PKLiVV9SMQdw== X-Received: by 10.28.103.69 with SMTP id b66mr1289831wmc.73.1485931790352; Tue, 31 Jan 2017 22:49:50 -0800 (PST) Received: from ?IPv6:2003:c6:ebc5:6c00:c4cb:dab7:ab36:4977? (p200300C6EBC56C00C4CBDAB7AB364977.dip0.t-ipconnect.de. [2003:c6:ebc5:6c00:c4cb:dab7:ab36:4977]) by smtp.googlemail.com with ESMTPSA id l140sm27833450wmg.12.2017.01.31.22.49.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 22:49:49 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 5/9] mmc: meson-gx: improve interrupt handling To: Ulf Hansson , Carlo Caione , Kevin Hilman References: <584e5061-d359-1436-05ee-3767a5a4b10f@gmail.com> Cc: linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org Message-ID: <23e1aac3-5761-944a-f3ca-cb88a9e44ad8@gmail.com> Date: Wed, 1 Feb 2017 07:48:58 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <584e5061-d359-1436-05ee-3767a5a4b10f@gmail.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 Disabling and immediately re-enabling interrupts in meson_mmc_request doesn't provide a benefit. Instead enable interrupts in probe already. And disable interrupts in remove, this was missing so far. Signed-off-by: Heiner Kallweit Reviewed-by: Kevin Hilman --- v2: - no changes --- drivers/mmc/host/meson-gx-mmc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 4ce4c640..0fba23d2 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -546,11 +546,6 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) /* Stop execution */ writel(0, host->regs + SD_EMMC_START); - /* clear, ack, enable all interrupts */ - writel(0, host->regs + SD_EMMC_IRQ_EN); - writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS); - writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN); - host->mrq = mrq; if (mrq->sbc) @@ -777,8 +772,8 @@ static int meson_mmc_probe(struct platform_device *pdev) writel(0, host->regs + SD_EMMC_START); /* clear, ack, enable all interrupts */ - writel(0, host->regs + SD_EMMC_IRQ_EN); writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS); + writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN); ret = devm_request_threaded_irq(&pdev->dev, host->irq, meson_mmc_irq, meson_mmc_irq_thread, @@ -816,6 +811,9 @@ static int meson_mmc_remove(struct platform_device *pdev) if (WARN_ON(!host)) return 0; + /* disable interrupts */ + writel(0, host->regs + SD_EMMC_IRQ_EN); + if (host->bounce_buf) dma_free_coherent(host->dev, host->bounce_buf_size, host->bounce_buf, host->bounce_dma_addr);