From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 68E84C7618B for ; Fri, 26 Jul 2019 15:26:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36FBE22CB9 for ; Fri, 26 Jul 2019 15:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154776; bh=FRciB1yA1DxjbCHpmDO0WRMR7w5dHjxxxVzA/BzhcDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2nSHHHilaFBUGrVqwU7HnT/ehv+zmG+zIoMIUS0D3pKeZL173djo4YGthoL4d+5es QFBZV2sIQxmcsdPSyREE4QfTUbIWg72tRRXWzih/DjurRY3g0wxU4a+MmvGptcqDRt 7YK0ei4Ox4kxMGA2qHxakpgAORqcalXR9YxJjjYo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728017AbfGZP0P (ORCPT ); Fri, 26 Jul 2019 11:26:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:40206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727476AbfGZP0O (ORCPT ); Fri, 26 Jul 2019 11:26:14 -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 A554F22CB9; Fri, 26 Jul 2019 15:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154774; bh=FRciB1yA1DxjbCHpmDO0WRMR7w5dHjxxxVzA/BzhcDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=etlYDkuD55wQbspm4z9clMDAlMpOxLLRXP63FfnCvBPG02+ZyvY1Vafak4fMiytKJ k+oDZESNOn5iOdwOORsIi58q4jMSj05arIIUJ5ZjqgpH7Dd6x0iAIzlf0nQE0SKPAG 7KLRe8N2o9zfD/ZCm/q7m2vg8OsOZsPbD//ffgeY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , "David S. Miller" , Marcus Seyfarth Subject: [PATCH 5.2 22/66] sky2: Disable MSI on ASUS P6T Date: Fri, 26 Jul 2019 17:24:21 +0200 Message-Id: <20190726152304.200997002@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152301.936055394@linuxfoundation.org> References: <20190726152301.936055394@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Iwai [ Upstream commit a261e3797506bd561700be643fe1a85bf81e9661 ] The onboard sky2 NIC on ASUS P6T WS PRO doesn't work after PM resume due to the infamous IRQ problem. Disabling MSI works around it, so let's add it to the blacklist. Unfortunately the BIOS on the machine doesn't fill the standard DMI_SYS_* entry, so we pick up DMI_BOARD_* entries instead. BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1142496 Reported-and-tested-by: Marcus Seyfarth Signed-off-by: Takashi Iwai Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/sky2.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4917,6 +4917,13 @@ static const struct dmi_system_id msi_bl DMI_MATCH(DMI_PRODUCT_NAME, "P-79"), }, }, + { + .ident = "ASUS P6T", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P6T"), + }, + }, {} };