Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbcCGCIV (ORCPT ); Sun, 6 Mar 2016 21:08:21 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:14771 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbcCGCIN (ORCPT ); Sun, 6 Mar 2016 21:08:13 -0500 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Sun, 06 Mar 2016 18:06:55 -0800 From: Alexandre Courbot To: Ulf Hansson , Adrian Hunter , Arnd Bergmann CC: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, gnurou@gmail.com, Alexandre Courbot Subject: [PATCH v4 0/3] mmc: sdhci: Set DMA mask properly Date: Mon, 7 Mar 2016 11:07:54 +0900 Message-ID: <1457316477-8153-1-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.7.2 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1618 Lines: 37 64-bit capable devices are supposed to set their own DMA mask. Currently this does not happen for sdhci devices excepted for the two (sdhci-acpi and sdhci-pci) that define a enable_dma() hook and do it there. However this hook is called from several places while DMA mask is supposed to be set only once ; for instance the sdhci-acpi driver maintains a flag just to make sure the DMA mask is set only upon the first call of this hook. For the vast majority of drivers that do not define a enable_dma() hook, the default 32-bit DMA mask is used and there is a risk of using unneeded bounce buffers on hosts capable of 64-bit addressing. The first patch adds a default DMA mask setting function that is called when a DMA-capable host is added. It tries to set sane DMA masks according to the device's reported capabilities. The addition of this function seems to make the same code in sdhci-acpi and sdhci-pci redundant, so it is removed from these drivers. On top of making this series a negative line count, it also removes one usage of the obsolete pci_set_dma_mask() function. Changes since v3: - Unset the SDHCI_USE_64_BIT_DMA flag if setting of 64-bit mask failed - Carry Acked-bys Alexandre Courbot (3): mmc: sdhci: Set DMA mask when adding host mmc: sdhci-acpi: Remove enable_dma() hook mmc: sdhci-pci: Do not set DMA mask in enable_dma() drivers/mmc/host/sdhci-acpi.c | 30 ------------------------ drivers/mmc/host/sdhci-pci-core.c | 15 ------------ drivers/mmc/host/sdhci.c | 48 +++++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 52 deletions(-) -- 2.7.2