Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3447668pxk; Mon, 5 Oct 2020 09:52:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSfgGWoAqcQTwNlgQyin8lMPrR5NA43XHWYEc+p3KI72VP3op44HDz5KJWsUdryK1Rl3Ei X-Received: by 2002:a17:906:3f95:: with SMTP id b21mr620364ejj.93.1601916739893; Mon, 05 Oct 2020 09:52:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601916739; cv=none; d=google.com; s=arc-20160816; b=r3OwOoZpkvd61A+41MSYkbPJsVzZlYXvB0RbT5mFDSgTfOIDHsjXXHqxGMjup6GS9G okwPe1VKBRltTfyBA9NI38R21ExTNr1/rLM5ZOj85uzV3BxJtIwDBDsMmNRB+j8/5JeT Q996q4C9oVDA9xsKt6OldP6c2H8SVqxx4/5liZPhtQGwMSXRWjl3hwuFiI8Ktg8anRa2 aYLPkXcZtptta9/fJdGD1+uNOpwi6QvYKm43eHeC601tku0VZR/2Cy/fO1jkKmYEwOej pO83aHs1aYxANkv8W4oMdzCg7D3vUAEX4eCMflo2FxLxe8QMZqf8Bk2A/1vC4opSXh7R bVVw== 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=zoF4HhaKHMqAl1CjwFIizCi77coLOXRpZ0yrxs2Tvtc=; b=avxec3+++cCr/bFTpFBHr4wX9ebanef5u7rDnSP7xC/lhJAYYu07W3jIEjg78cVvRp nQqkvYcx2+yuSn1OH20BOmDe1g7C7GifZ+bCQ3tPRxbJmub006FkorzIRXR6EAcKzt95 Cl99h/wiGtDZMjSLeeEBotRBzZJvFFgJta329wDYVrvCR8JCC/yIeKlYuc/q6QnnCuO8 mTIhD/iqpmyslcOL+EPEuCI9suKeVAOMdG74uSctA9TpMN02LJhZy3QbrAMExyjHd6Fs dnXLaDN/5CUOAj+D12gVxaI82+qolWgGpLoxM230FUWquxsA5J2Vb9G4YVZuwRroT19s cHCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ejjyWHcB; 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 qn17si117268ejb.303.2020.10.05.09.51.56; Mon, 05 Oct 2020 09:52:19 -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=pass header.i=@kernel.org header.s=default header.b=ejjyWHcB; 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 S1727070AbgJEP0s (ORCPT + 99 others); Mon, 5 Oct 2020 11:26:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:51144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725960AbgJEP0s (ORCPT ); Mon, 5 Oct 2020 11:26:48 -0400 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 2811B2074F; Mon, 5 Oct 2020 15:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911607; bh=7aZjR4yIpfV5tcG8nGBtXatjNrjHjZEOYWU8W1qE+2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejjyWHcBeI70tkuFwcCfelM87eq0Fvt89PCLm9IoRKjEcgUUijWW43X2jyU8EjjfI GSQDAQrKnEl3ZhawZhUfnuwqa8UR/H9lvMxc25z1so+i5I5DYYP8ZfrAbt3GLi0cX+ lZyRA4vFFryDJ506VERljJNTnjPCPF/y053eEt9w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Adrian Hunter , Ulf Hansson , RussianNeuroMancer Subject: [PATCH 4.19 01/38] mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models Date: Mon, 5 Oct 2020 17:26:18 +0200 Message-Id: <20201005142108.718412325@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142108.650363140@linuxfoundation.org> References: <20201005142108.650363140@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore 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: Hans de Goede commit afd7f30886b0b445a4240a99020458a9772f2b89 upstream. Commit bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on Intel GLK"), disabled command-queuing on Intel GLK based LENOVO models because of it being broken due to what is believed to be a bug in the BIOS. It seems that the BIOS of some IRBIS models, including the IRBIS NB111 model has the same issue, so disable command queuing there too. Fixes: bedf9fc01ff1 ("mmc: sdhci: Workaround broken command queuing on Intel GLK") BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=209397 Reported-and-tested-by: RussianNeuroMancer Signed-off-by: Hans de Goede Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20200927104821.5676-1-hdegoede@redhat.com Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-pci-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -739,7 +739,8 @@ static int byt_emmc_probe_slot(struct sd static bool glk_broken_cqhci(struct sdhci_pci_slot *slot) { return slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_EMMC && - dmi_match(DMI_BIOS_VENDOR, "LENOVO"); + (dmi_match(DMI_BIOS_VENDOR, "LENOVO") || + dmi_match(DMI_SYS_VENDOR, "IRBIS")); } static int glk_emmc_probe_slot(struct sdhci_pci_slot *slot)