Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp674537img; Fri, 22 Mar 2019 06:21:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDa8dtNjyFGm0+agtfzJ+nbRUhlKe/qVsBNvPBGQuDI3Bzh6pBxeaKxPHIESGGWHg1rmRR X-Received: by 2002:a17:902:bd90:: with SMTP id q16mr3313674pls.162.1553260890488; Fri, 22 Mar 2019 06:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260890; cv=none; d=google.com; s=arc-20160816; b=Vk6oI/EnU0UtgxawrZ+g+GXJX0rUBKd+8qdCDL30r8rF9Y1Hpi4FcVFeyhZgSm5y3Y VVapH4lmOoE0sYp71CmcEH6h+c+VU0sL9srh/JWVkctVoZ/xrcYgJqhCwfEzACAti2M7 Y9ywf1aLhpn25kMIGWShkldBE7XWsPfnfLcjVu5KHfVwa7RYiTL64hHBQ0dlFAFVoiR5 GGNnoE4E4bpWjk7r1P2Bh82CpwkzV493s2H6PvsXU0/6o9i0nYhAE5pZxCHG7nff/KCy M6b6Ih7Jmw8A4D2gp3G9RAeS1iEqb1jbG4u0WCYSxfLQa5kfufoUnR6RgfpSg00S7h34 m5Rg== 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=XVT9EtWs5pDXxb8GfcFenFUHUntAfdLbVFvxH6mVt4I=; b=CINwngXEKKnyJlxAj1qQQUFipJEMGEZmSvIGCk/5gbbd0cC0IHO3twpM4yKSzdIOKC k06zHszMKOKWn8abdNhSYHF4fAK40AKrc8C0a4d4TIOzhHj0R77zGjoF4rx2sLUu2IJG g/LEwkjrZ8fXVHnyju6wecSWrHk/aJCRNWuBGsS4/2EfR0OQEtfiCEMOSwD1068VyGcn t1CjEpZ7N4el4EVSeVj7yywF9+V23Q1O8izMzH0Ow21Ha73m0TlanYDbJNnOdP216Bco oiGM5SisKNzjsdJhNsSvYajDQaVtp1i+LlKJwclx/2svmN44BQMtjuv9ZEd9kLAYIf3Z +uCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NzaWIsUA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 o1si6923454plk.7.2019.03.22.06.21.15; Fri, 22 Mar 2019 06:21:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=NzaWIsUA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728852AbfCVNTY (ORCPT + 99 others); Fri, 22 Mar 2019 09:19:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:49370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728801AbfCVLWf (ORCPT ); Fri, 22 Mar 2019 07:22:35 -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 C6AA02190A; Fri, 22 Mar 2019 11:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253755; bh=xNtdWV5kvnQyQWciiYGVCBjNQpls4Yx4jsil5hyLMqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NzaWIsUAgCaCrD85PcUhY3L/PTg/PxLjS+Sf8G+I4JaHq3YVhIBOgDGuOfu6E42Hy tstdiXmMAzIRdyETErq8mVCzxWt2xd2YVqjtDLsOq0gFzuCPxABDk16jKaYk4dQNeR oTwcMxgRzLAiDPni4fbvruRkeJEfxLyMaIS9+S6Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , "David S. Miller" Subject: [PATCH 3.18 045/134] sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79 Date: Fri, 22 Mar 2019 12:14:18 +0100 Message-Id: <20190322111213.156735721@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kai-Heng Feng [ Upstream commit b33b7cd6fd86478dd2890a9abeb6f036aa01fdf7 ] Some sky2 chips fire IRQ after S3, before the driver is fully resumed: [ 686.804877] do_IRQ: 1.37 No irq handler for vector This is likely a platform bug that device isn't fully quiesced during S3. Use MSI-X, maskable MSI or INTx can prevent this issue from happening. Since MSI-X and maskable MSI are not supported by this device, fallback to use INTx on affected platforms. BugLink: https://bugs.launchpad.net/bugs/1807259 BugLink: https://bugs.launchpad.net/bugs/1809843 Signed-off-by: Kai-Heng Feng Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/sky2.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -93,7 +94,7 @@ static int copybreak __read_mostly = 128 module_param(copybreak, int, 0); MODULE_PARM_DESC(copybreak, "Receive copy threshold"); -static int disable_msi = 0; +static int disable_msi = -1; module_param(disable_msi, int, 0); MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); @@ -4913,6 +4914,24 @@ static const char *sky2_name(u8 chipid, return buf; } +static const struct dmi_system_id msi_blacklist[] = { + { + .ident = "Dell Inspiron 1545", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1545"), + }, + }, + { + .ident = "Gateway P-79", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Gateway"), + DMI_MATCH(DMI_PRODUCT_NAME, "P-79"), + }, + }, + {} +}; + static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct net_device *dev, *dev1; @@ -5024,6 +5043,9 @@ static int sky2_probe(struct pci_dev *pd goto err_out_free_pci; } + if (disable_msi == -1) + disable_msi = !!dmi_check_system(msi_blacklist); + if (!disable_msi && pci_enable_msi(pdev) == 0) { err = sky2_test_msi(hw); if (err) {