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 5E8DFC32750 for ; Fri, 2 Aug 2019 09:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C3C1206A2 for ; Fri, 2 Aug 2019 09:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739399; bh=RSxo86md8Iroy417st3d8Ja6MLXzxYiLawRSfVwbvy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IHBTwgJAFFIsiIjqqAkYctmtxSIvU6v/l4qZ3KtAxHLbkB2n4nJgjpE0DtvlDezNt OBJs7+I7DGmDE0fEsR/wvwavMQx4qP7chi2/WHRGS7Fbx1gIOrSmPWgviF/ZvVUCQJ Hyojb05jfIm+yOC07AINWBfwHPQPARfPWx0LlaPg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732294AbfHBJt5 (ORCPT ); Fri, 2 Aug 2019 05:49:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:50284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405499AbfHBJqL (ORCPT ); Fri, 2 Aug 2019 05:46:11 -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 C8D942171F; Fri, 2 Aug 2019 09:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739170; bh=RSxo86md8Iroy417st3d8Ja6MLXzxYiLawRSfVwbvy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mwYQzEytu/kaTjMhtCj97O8oMZfXPduV4cz+Lo7Z6Mv4xMqgkaSr0/ypBNYQOeWXW PFoLSnurOdkOmt7Q18XaGt6g5pwxO+oA+Kn+SwUlyPMRcmoiuqQjrJb6vyMaBwdDUA UyuqJuWrCtv5aOMDKRb9zJssMsZRRK2LHU9VYfS4= 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.9 140/223] sky2: Disable MSI on ASUS P6T Date: Fri, 2 Aug 2019 11:36:05 +0200 Message-Id: <20190802092247.815563464@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@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"), + }, + }, {} };