Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp877232ybm; Wed, 27 May 2020 10:06:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGGn6FLLdAyHVdCRDF/eZN79M/i6tlruK8wLkb4fJyAur2tH2WRRIAVvC8z0pGDSbNMKvk X-Received: by 2002:a50:a7a5:: with SMTP id i34mr15205337edc.55.1590599206311; Wed, 27 May 2020 10:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590599206; cv=none; d=google.com; s=arc-20160816; b=kOCQwmFpRcKYzNhcBoVYFk5jpgUlBscfOueIcUaZwPv+HTP6GvEo4EhBkUfki7ZaKn jCLOZShioXpdZzQekvyV6djsWaUboq7T+4X4KlN4HDyMpa8yWWky0R59zLHDoOtdJpQS hASkmWKFk9UYY6tHT0h4li+KY8jxysYjUvoRVyMTqONRwfSUIORh7o0VnsW8riCDJ6cb S1Ouhd5Yd5Rh0n+a84pVOoGK1l1efy7+BNWV0ZEtsSQO6e/+wGmKhrMbZv73crvq+jaU F8YqomdINEoO348hBHTwp7s21/retZYv7hdrvm9xr+ptD549Sig67TvTN6k3Dt6/+BYS hAlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:dkim-signature; bh=7YUZLc2BzQ1Asc9PPbKcBTPdgqOxpCRtajZKTf22k+0=; b=WKLGtNT3wzDzNjM7aOv/H9+VlVKJYi4pMTB7118nWyG/RW7UPuEF0ezk+gQCnfglZa O6tw+JHTk793bnB3cHvsZgdyUN3NJwkVI6hboIt5EZ34zgB34n66i0RTBRcFa0cqcr7K Up51Z7fVrCniWxMWinUIB4RHN3oCCxbwDBUzMCgeQ9PAgFNDl0+L2sVm0ijPEg+z7N+o hRQppsWLP+9BgVeriKL/r6jG0HG/bf77dTD+14NxXoIfrO0oc6GZJXroMNkyJuzho5hm 4pJP+CG9TVC6b2OBMkvZz5yxWCV/G/v0VSWlzQbAkrOG+Y+rf5W5wQIKVLzdEq7KiI8r +gNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=M50TPks8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id rk18si2247791ejb.715.2020.05.27.10.06.11; Wed, 27 May 2020 10:06:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=M50TPks8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387651AbgE0K53 (ORCPT + 99 others); Wed, 27 May 2020 06:57:29 -0400 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:12826 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387606AbgE0K52 (ORCPT ); Wed, 27 May 2020 06:57:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1590577047; x=1622113047; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qRA+oC9tZx1B+vIUo3ULzvQS5oErAP6UNoXsB48BUDA=; b=M50TPks84vymU1Dmg3u62HHkXrThJsjxu5SMJGLa9vdZX3A247Yi9ITJ T9d3KInQtwbYmF7/jv9jAvG24MXFRXPpt32NpHMIH58qZPNcLd+XaXKED 6539tq8jGMcHaIkCsWX7AxZwQc2suYvpqTkYH3trA/VqTIo+3zgf3eq6r 0Zy/RBUELphOIC/Dc93Yz6tIHw1JhgpWrXL37tw7iN02kSc0I3A/CAn1t D8kSCTpe+MPvgJ9SSw3Nm/+EeQsqBGqXldIvcPOWtFWBFv20cdUVRKEn9 it/kZq4WnpiUn6DncvwFlb9PxtbrdImO8at657wbRb79iOz8vwM0DxidG A==; IronPort-SDR: AZDZqxdfCTzspJ/Gm4ZZw0RNHGplphn57NF+/SJJdoQzSqBpVLiNFiPBI+NnlMFWVWesqcFQPG uLYxGJeRp6PKuYGdO+IsXxfJoAr0jEV3Ns6I3xVVyaBspezSlJRN1uS8PbTvhBux5+sMcp5V/p BvwqTqFYEAsjFG3eNFLQtf7HUv1KYq/djmn8YuuUbOO90rXnHgJlpdGYcVSjoskBkEsDmVrwea pZNSNdmwehjm7qJbCD9sEEBg7HTCcdbh2C43Kvp2KxRIYmdwlQNlvKbpUGMaPzNLTPJd3RSatS xes= X-IronPort-AV: E=Sophos;i="5.73,441,1583218800"; d="scan'208";a="74602760" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 27 May 2020 03:57:27 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 27 May 2020 03:57:20 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Wed, 27 May 2020 03:57:15 -0700 From: Eugen Hristev To: , , , CC: , , Eugen Hristev Subject: [PATCH] mmc: sdhci-of-at91: fix CALCR register being rewritten Date: Wed, 27 May 2020 13:56:59 +0300 Message-ID: <20200527105659.142560-1-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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