From patchwork Wed Sep 4 17:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 172954 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp271580ilq; Wed, 4 Sep 2019 11:13:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1BFSRLKN26rfCi/3OZESn9ZYUKDOgMqgqI8ijbLywUHddfyQqqCWWvltSGZ356BzH4euJ X-Received: by 2002:a65:534c:: with SMTP id w12mr36325917pgr.51.1567620795691; Wed, 04 Sep 2019 11:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567620795; cv=none; d=google.com; s=arc-20160816; b=RBwulzqJ6A4sB85jNUa3k1g9TiiyfiQkRJcCrNVWYd8r1MqhfBR4wsuMXSO4FqFw8p ReZudzhUSEJtJJMIrM2oZJv/EoAuous7pOIsrD/JAFe4KpqctyRqHRVKBrxD/HDDkAgo 2vUCs9FZ5mcDzbmzkmoA/oxtfJp57pq/RIhpu4pSEUuJY0Xh/FPUiVEyRZ6oOfC9LHyg vhMnuFCIeDfFz+7rRUyN8PAeCIAQUnCEk3X2+5NVTc1LV18VFllor1mCbj82QPq/AgA2 lIRYRu1eSm62nweCHJ+R8EdyaXf2ShAxi4ZaizlblySY1CohcwiDmdev8NhyFdMMq/SN EKdg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0oTSEfQofQ5jo58Sz06lJfxPSTEEQEGpm5nI+oYJ+yc=; b=wBD0M3EHT82jHEVVo8Ly+f5depvXVRtaJBTIXHnJ+o0/nDlJcnBZv0WiAWldign7mR Fhu2PJKs00G9S9EdZmnaC5ezgSebniw4z8VnBr2NlDTyTDve1xrGiv28X1ZM5tw5CPQe DZg4q7CW/tGWccQ4/zWW8Wk4cFsXMlSahtBJybOPbEt0Cd9NcjtxOAJ59VpgE6RvMled n+Vsfk88/7KNmpidfPeqCxWfoWh+suKZeaDFx5Zuduz85lVK5Hs9f0UqjJUU3ZHrdmZu gWh92oMH/3oDG5rGEBUecE1hUx11Nz3uuudO2CzgygTc+yjEKFNdFUfM1DLpPG9gz2HB 3v6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q0gmUIjh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m4si2882241pjs.62.2019.09.04.11.13.15; Wed, 04 Sep 2019 11:13:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q0gmUIjh; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390008AbfIDSNO (ORCPT + 14 others); Wed, 4 Sep 2019 14:13:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:57920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390637AbfIDSNN (ORCPT ); Wed, 4 Sep 2019 14:13:13 -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 8C6D122CEA; Wed, 4 Sep 2019 18:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620793; bh=e4VEkKiQELvj7Z6AAa95aiGEQyZjhunkkdsvdZzpoo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q0gmUIjhao0S0JdrOJsQcjF6V6r+0e1r6Tcw18evvsxdb8vh56jMXiUSxSHg9wv5b hHJk86G/RXUciac/EFz1ckKIoxpkQ2ctMF8ZZs9FeEKATMxZdPegoExQIsPK8wI/x0 +bnj+6CI2dufSg0x6mAhQFgpY1xUTscAMKaeDUF4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Philip Langdale , Ulf Hansson , Manuel Presnitz Subject: [PATCH 5.2 095/143] mmc: core: Fix init of SD cards reporting an invalid VDD range Date: Wed, 4 Sep 2019 19:53:58 +0200 Message-Id: <20190904175317.892860511@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175314.206239922@linuxfoundation.org> References: <20190904175314.206239922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson commit 72741084d903e65e121c27bd29494d941729d4a1 upstream. The OCR register defines the supported range of VDD voltages for SD cards. However, it has turned out that some SD cards reports an invalid voltage range, for example having bit7 set. When a host supports MMC_CAP2_FULL_PWR_CYCLE and some of the voltages from the invalid VDD range, this triggers the core to run a power cycle of the card to try to initialize it at the lowest common supported voltage. Obviously this fails, since the card can't support it. Let's fix this problem, by clearing invalid bits from the read OCR register for SD cards, before proceeding with the VDD voltage negotiation. Cc: stable@vger.kernel.org Reported-by: Philip Langdale Signed-off-by: Ulf Hansson Reviewed-by: Philip Langdale Tested-by: Philip Langdale Tested-by: Manuel Presnitz Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/sd.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1292,6 +1292,12 @@ int mmc_attach_sd(struct mmc_host *host) goto err; } + /* + * Some SD cards claims an out of spec VDD voltage range. Let's treat + * these bits as being in-valid and especially also bit7. + */ + ocr &= ~0x7FFF; + rocr = mmc_select_voltage(host, ocr); /*