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=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 94DEDC433FF for ; Fri, 2 Aug 2019 09:34:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E7E3217D7 for ; Fri, 2 Aug 2019 09:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738453; bh=RSxo86md8Iroy417st3d8Ja6MLXzxYiLawRSfVwbvy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cTouFZggQgLWDXFRBlTjfOA8I1Q7XU/mmi4pXdjwH6CYiCOWyZ0RsqnZHxXIkbgzh +oAuJL0pC4NMBul02YNwTLcUYn4ZBziIgos3ETHx1Flu681sQ3b6zOJ+n3x7APnNIW zLXk1TkQJUJ0R9599zNjcUeqyFWsxvf+jDo0+Z8c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390588AbfHBJeH (ORCPT ); Fri, 2 Aug 2019 05:34:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:33812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390206AbfHBJeG (ORCPT ); Fri, 2 Aug 2019 05:34:06 -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 BDCA4217D4; Fri, 2 Aug 2019 09:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738446; bh=RSxo86md8Iroy417st3d8Ja6MLXzxYiLawRSfVwbvy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AFFQEqdAjaEFmPZzZyQwDqsUX4K9IpA8mVBDrdAyiBSe66njpvPwZlC4/16tVn+1X +a/rX73bC51VPU/Qsbq3ZqljNI1nVBr7Jn/VkMPejQzlncYyvx8VqtKarEV9LZjun1 oYl/tCHyJ2jdR5lk37XXv9B4ox4BHmyyx4lSJ6SA= 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 4.4 092/158] sky2: Disable MSI on ASUS P6T Date: Fri, 2 Aug 2019 11:28:33 +0200 Message-Id: <20190802092223.135511870@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@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 @@ -4939,6 +4939,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"), + }, + }, {} };