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,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 369D4C433DF for ; Tue, 16 Jun 2020 15:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1081121532 for ; Tue, 16 Jun 2020 15:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322933; bh=Qhi5KkPSXLeHybOGv76Qt/SYPAaz5EEHzGOkFjbQqds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YQwnG3XpUbd9bKGVa2QO2P5apcCg1A8q9baLzUuIozRgULhQZAqk+hzG3i1MOksn/ X/BY/guT04OVtjXe1cANdI54DnUov8mwjpW7NXf0A8L7T+isgUMc2Q7+LU8YbjSWoT T6n0d3IEBxaWExVr6rppekr2+2Dia9wFMMFpalN8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732114AbgFPPzb (ORCPT ); Tue, 16 Jun 2020 11:55:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:54898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733051AbgFPPzF (ORCPT ); Tue, 16 Jun 2020 11:55:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1298D21527; Tue, 16 Jun 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322905; bh=Qhi5KkPSXLeHybOGv76Qt/SYPAaz5EEHzGOkFjbQqds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l/axVOy4/qHQXF5ST/8C9N+pcqIMEQoQDLCSDagnK0va1x6ijqryGcFZoNUM/1OKh QixDVZT+nrb9Ip56s+xVbdtCXvP+UuJ+YNRRiwr/T8vvnS4opQ++anuZ7gCmqaeZvQ U1HTiSlQbFDBHIhE54nXsGH0RH8YFLBDGvtBdd9Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eugen Hristev , Ulf Hansson Subject: [PATCH 5.6 149/161] mmc: sdhci-of-at91: fix CALCR register being rewritten Date: Tue, 16 Jun 2020 17:35:39 +0200 Message-Id: <20200616153113.438513088@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153106.402291280@linuxfoundation.org> References: <20200616153106.402291280@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eugen Hristev commit dbdea70f71d672c12bc4454e7c258a8f78194d74 upstream. 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 Link: https://lore.kernel.org/r/20200527105659.142560-1-eugen.hristev@microchip.com Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-of-at91.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c @@ -136,9 +136,12 @@ static void sdhci_at91_reset(struct sdhc || 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 = {