Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp829189pxb; Tue, 3 Nov 2020 13:44:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8VnRYiB9clEUrIeVoZRNQa0W36VNRCyYrHc037D1DFcHSkmQ+Lv7pXpCQWdaC4E0VmkSS X-Received: by 2002:aa7:c716:: with SMTP id i22mr22718816edq.94.1604439892209; Tue, 03 Nov 2020 13:44:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604439892; cv=none; d=google.com; s=arc-20160816; b=PxdNJnKNuAZqUSLQ9S0OyhBXotj6KSosGNbL9Q/sLWouTPhI41cPWsAlsc48utHotq FnJCgXNjDdekJjIM3kK5Ojoe+F/IZW9jMBRtoyMzlyHqfpCuLI+iRx3akTC6UgBK/Q2e ng3QSX4ybrflYtVCkBHifG02sRBGxEyZq715PXsRzvy0G8QQN66AO6aajnNNhqYJENEs mDT5XyleLEcE849ecOXNBzM9tqcr+9TGKy82tA7oDWc6Ica7xzdUvc2D0AZevCt6o6zc ufmPe55wlKSKWNK8WPyl6odViljW+A9zrZ/Yijx9r48FInYhpkDfymcdd5Fie2W129uT WR+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Rw3muh3vmnZuW9U7okOXomQmjFiTMYZGT18KaRVkgGA=; b=uIhVJEkEhGZMwD1TdaaWNxadwcWIDElUzw82tqiRJn1/UlolrCMsUuHXb+NZeMKGh2 xh6s8x/m7sLczagI4ehXONsBg06AN5rBBhIJIPD/ChDiet3bdc+2g4sCSOZTqNLOaC67 6x4g2BwQgGl7oieWohqa2f2qKJc5rTQTUNz93iFjyZ0S53/4m/RcWB1KPNrnSbXAhAqs l5ibbMMahltdbMqXM3XITOxVnuiwETF4PnkZPQO0sw7tVDYXjnFPB92vftQCcCexK8eB g6RH+3yNTtDliNRuWpAJnsJkeQTVN9VqDJ4rVkIve0sOT8ZX/uqUiErdxL15IkOk8lr5 lFsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JBri5T3E; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m25si7462897edp.176.2020.11.03.13.44.29; Tue, 03 Nov 2020 13:44:52 -0800 (PST) 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=pass header.i=@kernel.org header.s=default header.b=JBri5T3E; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732764AbgKCVkl (ORCPT + 99 others); Tue, 3 Nov 2020 16:40:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:58280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732721AbgKCU43 (ORCPT ); Tue, 3 Nov 2020 15:56:29 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 D5FC820732; Tue, 3 Nov 2020 20:56:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436989; bh=jCh3GPxe7Xy+C+hwntiI4Tqu9vycF/OM7TydPDkmcTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBri5T3EBXnza1BqRQRGQLX7WzZNXkyFOpuV3Z5qiKFaPaiC/utp7PR4E3ZwhhrQV 4trJPxiymTE+R12EbzdK9/nES+u/yyIuA0JkgMwiOWCjXHik8jw5fjYYvzhMIVYN4D DRYltOs2YVvi49NwQcx1kMoFGeFrmJtBREDjHHPw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Raul E Rangel , Adrian Hunter , Ulf Hansson Subject: [PATCH 5.4 098/214] mmc: sdhci-acpi: AMDI0040: Set SDHCI_QUIRK2_PRESET_VALUE_BROKEN Date: Tue, 3 Nov 2020 21:35:46 +0100 Message-Id: <20201103203259.699593182@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Raul E Rangel commit f23cc3ba491af77395cea3f9d51204398729f26b upstream. This change fixes HS400 tuning for devices with invalid presets. SDHCI presets are not currently used for eMMC HS/HS200/HS400, but are used for DDR52. The HS400 retuning sequence is: HS400->DDR52->HS->HS200->Perform Tuning->HS->HS400 This means that when HS400 tuning happens, we transition through DDR52 for a very brief period. This causes presets to be enabled unintentionally and stay enabled when transitioning back to HS200 or HS400. Some firmware has invalid presets, so we end up with driver strengths that can cause I/O problems. Fixes: 34597a3f60b1 ("mmc: sdhci-acpi: Add support for ACPI HID of AMD Controller with HS400") Signed-off-by: Raul E Rangel Acked-by: Adrian Hunter Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200928154718.1.Icc21d4b2f354e83e26e57e270dc952f5fe0b0a40@changeid Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-acpi.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -658,6 +658,43 @@ static int sdhci_acpi_emmc_amd_probe_slo (host->mmc->caps & MMC_CAP_1_8V_DDR)) host->mmc->caps2 = MMC_CAP2_HS400_1_8V; + /* + * There are two types of presets out in the wild: + * 1) Default/broken presets. + * These presets have two sets of problems: + * a) The clock divisor for SDR12, SDR25, and SDR50 is too small. + * This results in clock frequencies that are 2x higher than + * acceptable. i.e., SDR12 = 25 MHz, SDR25 = 50 MHz, SDR50 = + * 100 MHz.x + * b) The HS200 and HS400 driver strengths don't match. + * By default, the SDR104 preset register has a driver strength of + * A, but the (internal) HS400 preset register has a driver + * strength of B. As part of initializing HS400, HS200 tuning + * needs to be performed. Having different driver strengths + * between tuning and operation is wrong. It results in different + * rise/fall times that lead to incorrect sampling. + * 2) Firmware with properly initialized presets. + * These presets have proper clock divisors. i.e., SDR12 => 12MHz, + * SDR25 => 25 MHz, SDR50 => 50 MHz. Additionally the HS200 and + * HS400 preset driver strengths match. + * + * Enabling presets for HS400 doesn't work for the following reasons: + * 1) sdhci_set_ios has a hard coded list of timings that are used + * to determine if presets should be enabled. + * 2) sdhci_get_preset_value is using a non-standard register to + * read out HS400 presets. The AMD controller doesn't support this + * non-standard register. In fact, it doesn't expose the HS400 + * preset register anywhere in the SDHCI memory map. This results + * in reading a garbage value and using the wrong presets. + * + * Since HS400 and HS200 presets must be identical, we could + * instead use the the SDR104 preset register. + * + * If the above issues are resolved we could remove this quirk for + * firmware that that has valid presets (i.e., SDR12 <= 12 MHz). + */ + host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; + host->mmc_host_ops.select_drive_strength = amd_select_drive_strength; host->mmc_host_ops.set_ios = amd_set_ios; host->mmc_host_ops.execute_tuning = amd_sdhci_execute_tuning;