From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BF66C433DF for ; Thu, 28 May 2020 10:16:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B657F20DD4 for ; Thu, 28 May 2020 10:16:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FvgxKN7m"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DhWW2TZa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B657F20DD4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VOXwDi2NAwa3CbyZooH/HbLjb65x7DgAi57zWO1Za6I=; b=FvgxKN7meOJAu/ cl55FYDvJzk0G6WvxWhZqfp7Mpcrbph+NSK1MncMX9V/qzT0/4yeRCU7LRvKaJAvBExMIa4BpZhLi GG34AXKGVwLKdRZZgOV9Toh7ENbr/hhABNf6f3aCV5tuiUTFfA84g8gwVj0mcyMi/l/JHkSfol7hh Ki7dm9x7mL/zvlbKh8QTeHyrysKMug7sRjC40/YiivtkrIsDT1BgYwmV5xJMeOKLW+/geKqjZRZ5K uH0RNrZ60Xn9WlQp77JbSXVV5A/sRF3hfEVvTm0gr+MsrF6dPhcMcpkzTJn3Onnj3ovTwpZ9aBUDQ YbeZPdE3RDtottYHhX2w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeFZv-0000QG-8J; Thu, 28 May 2020 10:15:59 +0000 Received: from mail-ua1-x944.google.com ([2607:f8b0:4864:20::944]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeFZK-0008Iq-0P for linux-arm-kernel@lists.infradead.org; Thu, 28 May 2020 10:15:24 +0000 Received: by mail-ua1-x944.google.com with SMTP id r9so4798367ual.1 for ; Thu, 28 May 2020 03:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ud/RiagjQwezZ9O6WViaS3IQ8v4tVVsn5ht8/yzb11s=; b=DhWW2TZaU6JSigxodhdP2DkzM4mSPNd/RucxhTUXSsjV2pHcFpvc8dEh3Ov7JMQxW6 fsUmTCaDFFHufNAajsvLIzzYGP27pmDxmGitL7edYHfBuuBBtFXfv/oGTsfoH/k9HpXO YFjP318+AFWQO5KHD3GxtTJLxRgCuuogI11pGC2wv09t42wptDew4J71VpJrkm0yNN7X ztL9NDef6xu6ZxXatZVug/HPuCc7NzpsKknCfdtuZQ8WKAaG23yuNJ8T6dCSkBhWfVJQ 5pvbOSmYg8z0luYXa051rY+OPSqgN1Sl+Hdx8FpAGQhONh4SiM57g8CEvgyQT3b44vPz 3pNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ud/RiagjQwezZ9O6WViaS3IQ8v4tVVsn5ht8/yzb11s=; b=uXU3yNodPrtMcO8MHWFyX3NyxlQGv9gVOn6oYhWtLz+WOtv6otLNz+2jWePLX7Pd5K kRvGJzZ5gcY/FUxQbDPbzKOvGifQEbNIjfd25/lVouJswZSdm2zu44hSq0uApBijHJPZ rhIYOOCB6UuDWAfCypa1amZgPXzQ2vIHqQYax4qycIayufghCs/bTs03xJuG91jw5DPn o1X0Otehklw9gT0szGq6y5BnJ4To51rT4HhAH9DNbAWpeTfaoJYky3CzAighVa6ThpY+ 6i0iIH/iX6T9oJMbSeLuEdVIA7eI6j8JNXYC3+hdhIn159bkRJJ/i+9NPuBE4XyGyFEy 2jgw== X-Gm-Message-State: AOAM5305ZZoaApDep7MaAh4BJC1FCky9js7pjkIfm2craOGXYdDbGskk k9Vn9DK6r5OLFOYjWw+qY7rUUnhDs8UBkSCf75sMCA== X-Google-Smtp-Source: ABdhPJzzUCLBDPc9vy6c4Wlx/ry5lzfnFWaQGL62VHDyVauoVjIMYJ4ubcUNE8X304skZQRC7fxZJhLStDrVyXFD/q4= X-Received: by 2002:a9f:3701:: with SMTP id z1mr1467376uad.100.1590660920925; Thu, 28 May 2020 03:15:20 -0700 (PDT) MIME-Version: 1.0 References: <20200527105659.142560-1-eugen.hristev@microchip.com> In-Reply-To: <20200527105659.142560-1-eugen.hristev@microchip.com> From: Ulf Hansson Date: Thu, 28 May 2020 12:14:44 +0200 Message-ID: Subject: Re: [PATCH] mmc: sdhci-of-at91: fix CALCR register being rewritten To: Eugen Hristev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200528_031522_426028_55E3CFE3 X-CRM114-Status: GOOD ( 16.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ludovic Desroches , "linux-mmc@vger.kernel.org" , Adrian Hunter , Linux ARM , Linux Kernel Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 27 May 2020 at 12:57, Eugen Hristev wrote: > > When enabling calibration at reset, the CALCR register was completely > rewritten. This may cause certain bits being deleted unintentedly. > Fix by issuing a read-modify-write operation. > > Fixes: 727d836a375a ("mmc: sdhci-of-at91: add DT property to enable calibration on full reset") > Signed-off-by: Eugen Hristev Applied for next and by adding a stable tag, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-of-at91.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c > index 25f4e0f4f53b..1ece2c50042c 100644 > --- a/drivers/mmc/host/sdhci-of-at91.c > +++ b/drivers/mmc/host/sdhci-of-at91.c > @@ -121,9 +121,12 @@ static void sdhci_at91_reset(struct sdhci_host *host, u8 mask) > || mmc_gpio_get_cd(host->mmc) >= 0) > sdhci_at91_set_force_card_detect(host); > > - if (priv->cal_always_on && (mask & SDHCI_RESET_ALL)) > - sdhci_writel(host, SDMMC_CALCR_ALWYSON | SDMMC_CALCR_EN, > + if (priv->cal_always_on && (mask & SDHCI_RESET_ALL)) { > + u32 calcr = sdhci_readl(host, SDMMC_CALCR); > + > + sdhci_writel(host, calcr | SDMMC_CALCR_ALWYSON | SDMMC_CALCR_EN, > SDMMC_CALCR); > + } > } > > static const struct sdhci_ops sdhci_at91_sama5d2_ops = { > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel