From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbcKBIob (ORCPT ); Wed, 2 Nov 2016 04:44:31 -0400 Received: from mga04.intel.com ([192.55.52.120]:10197 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753044AbcKBIo2 (ORCPT ); Wed, 2 Nov 2016 04:44:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,583,1473145200"; d="scan'208";a="896771018" Subject: Re: [PATCH 2/2] mmc: sdhci: Use sdhci-caps-mask and sdhci-caps to change the caps read during __sdhci_read_caps To: Zach Brown , ulf.hansson@linaro.org References: <1477670171-30015-1-git-send-email-zach.brown@ni.com> <1477670171-30015-3-git-send-email-zach.brown@ni.com> Cc: robh+dt@kernel.org, mark.rutland@arm.com, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <68720b68-430c-bc69-f531-cc9884ade331@intel.com> Date: Wed, 2 Nov 2016 10:39:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1477670171-30015-3-git-send-email-zach.brown@ni.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28/10/16 18:56, Zach Brown wrote: > The sdhci capabilities register can be incorrect. The sdhci-caps-mask > and sdhci-caps dt properties specify which bits of the register are > incorrect and what their values should be. This patch makes the sdhci > driver use those properties to correct the caps during > __sdhci_read_caps. > > During __sdhci_read_caps > Use the sdhci-caps-mask property to turn off the incorrect bits of the > sdhci register after reading them. > Use the sdhci-caps to turn on bits after using sdhci-caps-mask to turn > off the incorrect ones. > > Signed-off-by: Zach Brown Apart from minor style issue: Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci.c | 24 ++++++++++++++++++++++-- > 1 file changed, 22 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 1e25b01..d5feae4 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > > #include > > @@ -2991,6 +2992,8 @@ static int sdhci_set_dma_mask(struct sdhci_host *host) > void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) > { > u16 v; > + u64 dt_caps_mask = 0; > + u64 dt_caps = 0; > > if (host->read_caps) > return; > @@ -3005,18 +3008,35 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) > > sdhci_do_reset(host, SDHCI_RESET_ALL); > > + of_property_read_u64(mmc_dev(host->mmc)->of_node, > + "sdhci-caps-mask", &dt_caps_mask); > + of_property_read_u64(mmc_dev(host->mmc)->of_node, > + "sdhci-caps", &dt_caps); > + > v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); > host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; > > if (host->quirks & SDHCI_QUIRK_MISSING_CAPS) > return; > > - host->caps = caps ? *caps : sdhci_readl(host, SDHCI_CAPABILITIES); > + if (caps) > + host->caps = *caps; > + else { All branches of 'if' should have {}. i.e. refer results of ./scripts/checkpatch.pl --strict > + host->caps = sdhci_readl(host, SDHCI_CAPABILITIES); > + host->caps &= ~lower_32_bits(dt_caps_mask); > + host->caps |= lower_32_bits(dt_caps); > + } > > if (host->version < SDHCI_SPEC_300) > return; > > - host->caps1 = caps1 ? *caps1 : sdhci_readl(host, SDHCI_CAPABILITIES_1); > + if (caps1) > + host->caps1 = *caps1; > + else { Ditto > + host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); > + host->caps1 &= ~upper_32_bits(dt_caps_mask); > + host->caps1 |= upper_32_bits(dt_caps); > + } > } > EXPORT_SYMBOL_GPL(__sdhci_read_caps); > >