From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH V3 1/2] mmc: sdhci: Allow CAPS check for SDHCI_CAN_64BIT to use overridden caps Date: Thu, 11 Feb 2016 14:07:25 +0100 Message-ID: References: <1455135940-29758-1-git-send-email-alcooperx@gmail.com> <1455135940-29758-2-git-send-email-alcooperx@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-yw0-f174.google.com ([209.85.161.174]:34839 "EHLO mail-yw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099AbcBKNH0 (ORCPT ); Thu, 11 Feb 2016 08:07:26 -0500 Received: by mail-yw0-f174.google.com with SMTP id g127so38110852ywf.2 for ; Thu, 11 Feb 2016 05:07:26 -0800 (PST) In-Reply-To: <1455135940-29758-2-git-send-email-alcooperx@gmail.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Al Cooper Cc: Adrian Hunter , linux-mmc , bcm-kernel-feedback-list@broadcom.com On 10 February 2016 at 21:25, Al Cooper wrote: > sdhci_add_host() allows the Host Controller Capability registers > to be supplied by the calling driver by using > SDHCI_QUIRK_MISSING_CAPS, but the check for the Capabilities bit > SDHCI_CAN_64BIT doesn't use the applied value and instead reads > the Host register directly. This change uses the supplied "caps" > register instead of reading the host register. > > This change will allow a calling driver to simply clear the > SDHCI_CAN_64BIT bit in "caps" to handle some cases of > SDHCI_QUIRK2_BROKEN_64_BIT_DMA. > > Signed-off-by: Al Cooper Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index d622435..ba3b072 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -2926,7 +2926,7 @@ int sdhci_add_host(struct sdhci_host *host) > * SDHCI_QUIRK2_BROKEN_64_BIT_DMA must be left to the drivers to > * implement. > */ > - if (sdhci_readl(host, SDHCI_CAPABILITIES) & SDHCI_CAN_64BIT) > + if (caps[0] & SDHCI_CAN_64BIT) > host->flags |= SDHCI_USE_64_BIT_DMA; > > if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { > -- > 1.9.0.138.g2de3478 >