From patchwork Wed Sep 4 17:54:08 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: 172944 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp260371ilq; Wed, 4 Sep 2019 11:04:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyVvWj1+YiiWmkZf3fkFfxoQIeF6tJqhFKAG7CFafhY6Rl92d+9l9hP7xQv2o+3gUDT4dV6 X-Received: by 2002:a17:902:aa91:: with SMTP id d17mr40482749plr.74.1567620244649; Wed, 04 Sep 2019 11:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567620244; cv=none; d=google.com; s=arc-20160816; b=yS1kbHSOY6APV8MuQ9kTp3kzQsSXOFM5kS4BhBveXCaFKMSf+coZTGcuMCjzF4NUFv imqniEuWjXjOqWiCH1GCcgwIdI5cNsIPSqqKV70lP+qCRyCgWJHxqr0vd06nx9LvjBQ0 HMbP9zqmeQVIGqS2MfWYO4X0sqLuW3VoGtNtAwAuBn2tM/DPTL+zXHG7vdClc4ZkFMsL FkkzkmQEW8dXNLKa0lYNJzdjtib1eK1GFgpU9egPjeDzxq07y8d/bwJe06aOxP71bZCD 6ozz7EnEhPYd4qPsROX5HWhS251HCwIuO/DX14PNrbwiKwCmjnwyfw6RNSscxEWRehJ2 fy0w== 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=CvUpV5ZsovYAf0KAwb/rcMUxhfITztitrSFiU1UE2gw=; b=LKdFP+pa/ucDmd7QaEDvYcRlTfvVixokK3Z36k8tdsb0mWzcgv4oT2XoY2Ha6pqUDE g2Hv8V08F2DpavDe/jHOa6SpByDSnvNsUx9P0yBfb/Kfdv/WwFlYA70X0qh+J9erkJzl Td/0nNBzBngk3By3NW+SRr6INpwX1HadU4d0mkxRdXwxv86ai7z91FR+B7/JHBn/p4ja LdSpHyFV7+vbXx0RgrVugSNpPCr8ymKv2rkjSMXmoIPXpYyHJwQK6y2jaw99tBD9rwiM RnnAkrwt6E3NzExKVleCFjEOSYYV14GYEo26CFhQ3ZZnOH5FLptV0kq5VN2rhEVMdQYY uyBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=r6smVa+T; 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 1si3002097pjf.45.2019.09.04.11.04.04; Wed, 04 Sep 2019 11:04:04 -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=r6smVa+T; 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 S2388458AbfIDSED (ORCPT + 14 others); Wed, 4 Sep 2019 14:04:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:44890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389049AbfIDSEC (ORCPT ); Wed, 4 Sep 2019 14:04:02 -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 B9478208E4; Wed, 4 Sep 2019 18:04:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620241; bh=71JlX85HloXRuFk35f6G10fhXpqx61Us6ZgYwqEoDeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r6smVa+Tkeh86SZRrL7ZuOm3UL2ltXWHmJ71vJ4q/Q7P5UHKhWhV3T22f4zI7LePo eucl0i/3Cwtsz7ZS14+aeCQh1+UlYg8JoSYdPURZU7AHu5p3O+7dmbtfYAGc1zqRTh RALZ2s3pjHDo5x44jMq35rOjjmyhCdnI0RInawdU= 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 4.14 40/57] mmc: core: Fix init of SD cards reporting an invalid VDD range Date: Wed, 4 Sep 2019 19:54:08 +0200 Message-Id: <20190904175305.967021644@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175301.777414715@linuxfoundation.org> References: <20190904175301.777414715@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 @@ -1232,6 +1232,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); /*