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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 2C8FCC3A5A6 for ; Thu, 19 Sep 2019 22:23:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF2822196E for ; Thu, 19 Sep 2019 22:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931817; bh=d9E8e5Yl/LVurahZOx39SNiiMA2U+50O6/6d+nmjWBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sM/CO11SWJFsT5tsyDM941WIg/8F7CijP/CnmQPU/Zbk8k4SPiFIVaug26xCyCcVy QXzzq0+gbTvOkUvNbP6QBwOFxLBHH3W+vL/bNdElHnPXAL72nGycuDdYVTk144OWA1 rREgMLTJuzxTPz17J+0e8vhigt8XFgN5GOsps1AQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407006AbfISWXf (ORCPT ); Thu, 19 Sep 2019 18:23:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:39294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406997AbfISWXd (ORCPT ); Thu, 19 Sep 2019 18:23:33 -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 5C3E4217D6; Thu, 19 Sep 2019 22:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931813; bh=d9E8e5Yl/LVurahZOx39SNiiMA2U+50O6/6d+nmjWBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PpuUeXieHjW164CEWV5WZLo95Dae37TXg9ah50cw+o4kTGJvOSgZPokQvvvdTjOd0 a5BoAUouEQhfyz5hB0E0mmdhpKAS+zx60Ng1fnmO1sfGkozQ+NgxCvyi0MrvmT1i9m KpsL4vv0/a9PPNQozrblNetT+RlgMYuKQI4NEK+c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , "David S. Miller" , Sasha Levin , SteveM Subject: [PATCH 4.4 49/56] sky2: Disable MSI on yet another ASUS boards (P6Xxxx) Date: Fri, 20 Sep 2019 00:04:30 +0200 Message-Id: <20190919214803.772490094@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214742.483643642@linuxfoundation.org> References: <20190919214742.483643642@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Takashi Iwai [ Upstream commit 189308d5823a089b56e2299cd96589507dac7319 ] A similar workaround for the suspend/resume problem is needed for yet another ASUS machines, P6X models. Like the previous fix, the BIOS doesn't provide the standard DMI_SYS_* entry, so again DMI_BOARD_* entries are used instead. Reported-and-tested-by: SteveM Signed-off-by: Takashi Iwai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/sky2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index dcd72b2a37150..8ba9eadc20791 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4946,6 +4946,13 @@ static const struct dmi_system_id msi_blacklist[] = { DMI_MATCH(DMI_BOARD_NAME, "P6T"), }, }, + { + .ident = "ASUS P6X", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P6X"), + }, + }, {} }; -- 2.20.1