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 04261C433FF for ; Mon, 29 Jul 2019 19:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCF662171F for ; Mon, 29 Jul 2019 19:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428934; bh=m4IhzfkG4WdTewNI3DALy3vQUl8DeziHc2wi2kspGA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z1Bj9iJwZi+AA64j0nkIq2//zTxHq5exWSwKiD0KZc6LmIU8yJUQAmFEyiqU17ikO lmvynkfMcqVvW9F8VKZo9n9gBDSDxh+jDnFxbRarl1dzFAoBL+z9In0/PXBRrv84W8 7USSrdRNQO2/0z9O/E8s18QcEoAkl/62hUBzNpZ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728703AbfG2Tfc (ORCPT ); Mon, 29 Jul 2019 15:35:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:49858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbfG2Tfb (ORCPT ); Mon, 29 Jul 2019 15:35:31 -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 3167D2171F; Mon, 29 Jul 2019 19:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428930; bh=m4IhzfkG4WdTewNI3DALy3vQUl8DeziHc2wi2kspGA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTu4BVLfBMHKL26QabTZrWc5jTplOstZiXKfg9P0O+XfSfY/Y47XdjZqfFoa29MsF IkZbCxJ3B850d5LTn+vn9Yn8aZDsXWPhq4KQ7WmxVmh16EKDbWtLSLN0Z870oa5S+M YVWlipFjhHfejiQ2OpfE/GJQn++7dHkkTUBtpoMQ= 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.14 192/293] sky2: Disable MSI on ASUS P6T Date: Mon, 29 Jul 2019 21:21:23 +0200 Message-Id: <20190729190839.179636066@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@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 @@ -4947,6 +4947,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"), + }, + }, {} };