From patchwork Fri Jul 26 21:52:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 2834526 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BBBA09F4E2 for ; Fri, 26 Jul 2013 21:57:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA3B520556 for ; Fri, 26 Jul 2013 21:57:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB27D20555 for ; Fri, 26 Jul 2013 21:57:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759599Ab3GZV5h (ORCPT ); Fri, 26 Jul 2013 17:57:37 -0400 Received: from cpsmtpb-ews04.kpnxchange.com ([213.75.39.7]:55709 "EHLO cpsmtpb-ews04.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756734Ab3GZV5g (ORCPT ); Fri, 26 Jul 2013 17:57:36 -0400 X-Greylist: delayed 308 seconds by postgrey-1.27 at vger.kernel.org; Fri, 26 Jul 2013 17:57:36 EDT Received: from cpsps-ews11.kpnxchange.com ([10.94.84.178]) by cpsmtpb-ews04.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 26 Jul 2013 23:52:26 +0200 Received: from CPSMTPM-TLF103.kpnxchange.com ([195.121.3.6]) by cpsps-ews11.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 26 Jul 2013 23:52:26 +0200 Received: from [192.168.1.102] ([212.123.139.93]) by CPSMTPM-TLF103.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Fri, 26 Jul 2013 23:52:25 +0200 Message-ID: <1374875545.1941.26.camel@x61.thuisdomein> Subject: [PATCH] mmc: sdhci-pci: mention DMA mode only once From: Paul Bolle To: Chris Ball Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 26 Jul 2013 23:52:25 +0200 X-Mailer: Evolution 3.6.4 (3.6.4-3.fc18) Mime-Version: 1.0 X-OriginalArrivalTime: 26 Jul 2013 21:52:25.0880 (UTC) FILETIME=[6A783980:01CE8A4A] X-RcptDomain: vger.kernel.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=-8.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 A laptop I use prints a warning twice at every boot and every resume: sdhci-pci 0000:05:00.2: Will use DMA mode even though HW doesn't fully claim to support it. sdhci-pci 0000:05:00.2: Will use DMA mode even though HW doesn't fully claim to support it. These warnings are always printed in pairs. This message shouldn't be a warning, but a notice, as there's little the user is able to do about the choice for DMA mode. The only way to overrule it seems to be the use of (undocumented) debug quirks for the sdhci module. And, furthermore, this notice needs only be printed once. Everything here depends on the hardware of the SD host controller used, which can't change. Signed-off-by: Paul Bolle --- 0) Tested on v3.10.3. Compile tested for v3.11-rc2. 1) Note that this warning is printed twice at boot (or module load) because the call chain is: sdhci_add_host() host->ops->enable_dma() = sdhci_pci_enable_dma() sdhci_init() sdhci_reset() host->ops->enable_dma() = sdhci_pci_enable_dma() (And, if I understand the code correctly, for non-quirky host controllers it can even print the warning three times!) The call chain at resume is: sdhci_resume_host() host->ops->enable_dma() = sdhci_pci_enable_dma() sdhci_init() sdhci_reset() host->ops->enable_dma() = sdhci_pci_enable_dma() 2) Note that the patch would be simpler if it's OK to print this message once per _module_ and not, as this patch does, once per _host controller_. Are there systems that use more than one SD host controller, both with different (advertised) DMA capabilities? drivers/mmc/host/sdhci-pci.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index d7d6bc8..69fc509 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -88,6 +88,7 @@ struct sdhci_pci_chip { unsigned int quirks; unsigned int quirks2; bool allow_runtime_pm; + bool use_sdma_notified; const struct sdhci_pci_fixes *fixes; int num_slots; /* Slots on controller */ @@ -997,17 +998,21 @@ MODULE_DEVICE_TABLE(pci, pci_ids); static int sdhci_pci_enable_dma(struct sdhci_host *host) { struct sdhci_pci_slot *slot; + struct sdhci_pci_chip *chip; struct pci_dev *pdev; int ret; slot = sdhci_priv(host); - pdev = slot->chip->pdev; + chip = slot->chip; + pdev = chip->pdev; if (((pdev->class & 0xFFFF00) == (PCI_CLASS_SYSTEM_SDHCI << 8)) && ((pdev->class & 0x0000FF) != PCI_SDHCI_IFDMA) && - (host->flags & SDHCI_USE_SDMA)) { - dev_warn(&pdev->dev, "Will use DMA mode even though HW " - "doesn't fully claim to support it.\n"); + (host->flags & SDHCI_USE_SDMA) && + (chip->use_sdma_notified == false)) { + dev_notice(&pdev->dev, "Will use DMA mode even though HW " + "doesn't fully claim to support it.\n"); + chip->use_sdma_notified = true; } ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); @@ -1504,6 +1509,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev, chip->allow_runtime_pm = chip->fixes->allow_runtime_pm; } chip->num_slots = slots; + chip->use_sdma_notified = false; pci_set_drvdata(pdev, chip);