From patchwork Tue Mar 10 12:38:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4965DC18E5B for ; Tue, 10 Mar 2020 12:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CD4A2467D for ; Tue, 10 Mar 2020 12:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844582; bh=2D4FIR9GBkiS0LsTGQEJSULlDlMwEyDFKr0ZL7m6JsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KrnejYTk/W0DLsbByaPwtapr6OIa+b9cYyuUHIKjW4qTG7CzlOu8rXnL7KfSXBN3k pnmd5+1z3JXJNlwPtKh4i6x6B8MLSy1jaI7tJXuFqEx7rJgbSX8zZ358g7L+eX0Pqg Ef4wyNUjvTgbO3usWwedplTeFcxD64UvY4R07JG0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbgCJMth (ORCPT ); Tue, 10 Mar 2020 08:49:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728484AbgCJMth (ORCPT ); Tue, 10 Mar 2020 08:49:37 -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 02A2C2467D; Tue, 10 Mar 2020 12:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844576; bh=2D4FIR9GBkiS0LsTGQEJSULlDlMwEyDFKr0ZL7m6JsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XeQcRu95zhiAkSHHRuNXL/TSozoaGOXUzQCNf7zvDGZNkij5ScfmBGUB3EgbrGysB 07pyxy+RkyOfJu6kb9wmy8nUHvX5QV6wQRTXqz1/4y2NSLKtZjaHRPB5o64J38OFzl gVAj4rb9oZCEcwzKyOjsPZ6TUC+n+E/jzH6AUKIU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Herrenschmidt , Leif Liddy , Andy Shevchenko , Keith Busch , Sasha Levin Subject: [PATCH 5.4 043/168] nvme-pci: Use single IRQ vector for old Apple models Date: Tue, 10 Mar 2020 13:38:09 +0100 Message-Id: <20200310123639.726928176@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123635.322799692@linuxfoundation.org> References: <20200310123635.322799692@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: Andy Shevchenko [ Upstream commit 98f7b86a0becc1154b1a6df6e75c9695dfd87e0d ] People reported that old Apple machines are not working properly if the non-first IRQ vector is in use. Set quirk for that models to limit IRQ to use first vector only. Based on original patch by GitHub user npx001. Link: https://github.com/Dunedan/mbp-2016-linux/issues/9 Cc: Benjamin Herrenschmidt Cc: Leif Liddy Signed-off-by: Andy Shevchenko Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index c8e55674cf937..cd64ddb129e5b 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3126,7 +3126,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_NO_DEEPEST_PS | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001), + .driver_data = NVME_QUIRK_SINGLE_VECTOR }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005), .driver_data = NVME_QUIRK_SINGLE_VECTOR |