aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTasos Sahanidis <tasos@tasossah.com>2019-07-14 13:31:11 +0300
committerDavid S. Miller <davem@davemloft.net>2019-07-14 13:45:54 -0700
commit76104862cccaeaa84fdd23e39f2610a96296291c (patch)
treee75b1b8c58ee26c0822fe95244725a9910efed3b /drivers/net
parentsis900: correct a few typos (diff)
downloadlinux-dev-76104862cccaeaa84fdd23e39f2610a96296291c.tar.xz
linux-dev-76104862cccaeaa84fdd23e39f2610a96296291c.zip
sky2: Disable MSI on P5W DH Deluxe
The onboard sky2 NICs send IRQs after S3, resulting in ethernet not working after resume. Maskable MSI and MSI-X are also not supported, so fall back to INTx. Signed-off-by: Tasos Sahanidis <tasos@tasossah.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/marvell/sky2.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index fe518c854d1f..f518312ffe69 100644
--- 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_blacklist[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "P-79"),
},
},
+ {
+ .ident = "ASUS P5W DH Deluxe",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTEK COMPUTER INC"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "P5W DH Deluxe"),
+ },
+ },
{}
};