| Message ID | 20190723151525.6526-1-tiwai@suse.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | sky2: Disable MSI on ASUS P6T | expand |
From: Takashi Iwai <tiwai@suse.de> Date: Tue, 23 Jul 2019 17:15:25 +0200 > 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 <m.seyfarth@gmail.com> > Signed-off-by: Takashi Iwai <tiwai@suse.de> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index f518312ffe69..a01c75ede871 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4924,6 +4924,13 @@ static const struct dmi_system_id msi_blacklist[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P5W DH Deluxe"), }, }, + { + .ident = "ASUS P6T", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P6T"), + }, + }, {} };
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 <m.seyfarth@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/net/ethernet/marvell/sky2.c | 7 +++++++ 1 file changed, 7 insertions(+)