rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply patch to fix tg3 watchdog hangs on BCM5906 devices (rhbz 825123)

Browse Source
This commit is contained in:
Josh Boyer 2012-07-05 13:44:39 -04:00
parent 4ce79607e9
commit 84bcf579de
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel.spec
View File

@ -797,6 +797,9 @@ Patch22042: ACPI-video-Still-use-ACPI-backlight-control-if-_DOS-doesnt-exist.pat
#rhbz 828824
Patch22043: rt2x00usb-fix-indexes-ordering-on-RX-queue-kick.patch
#rhbz 825123
Patch22044: tg3-Apply-short-DMA-frag-workaround-to-5906.patch
# END OF PATCH DEFINITIONS
%endif
@ -1480,6 +1483,9 @@ ApplyPatch ACPI-video-Still-use-ACPI-backlight-control-if-_DOS-doesnt-exist.patc
#rhbz 828824
ApplyPatch rt2x00usb-fix-indexes-ordering-on-RX-queue-kick.patch
#rhbz 825123
ApplyPatch tg3-Apply-short-DMA-frag-workaround-to-5906.patch
# END OF PATCH APPLICATIONS
%endif
@ -2218,6 +2224,9 @@ fi
# and build.
%changelog
* Thu Jul 05 2012 Josh Boyer <jwboyer@redhat.com>
- Apply patch to fix tg3 watchdog hangs on BCM5906 devices (rhbz 825123)
* Wed Jul 4 2012 Josh Boyer <jwboyer@redhat.com>
- Patch from Stanislaw Gruszka to fix rt2x00 USB access point (rhbz 828824)

32
tg3-Apply-short-DMA-frag-workaround-to-5906.patch Normal file
View File

@ -0,0 +1,32 @@
From b7abee6ef888117f92db370620ebf116a38e3f4d Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Thu, 7 Jun 2012 12:56:54 +0000
Subject: [PATCH] tg3: Apply short DMA frag workaround to 5906
5906 devices also need the short DMA fragment workaround. This patch
makes the necessary change.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/broadcom/tg3.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index edeeb51..e47ff8b 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14275,7 +14275,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
}
}
- if (tg3_flag(tp, 5755_PLUS))
+ if (tg3_flag(tp, 5755_PLUS) ||
+ GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
tg3_flag_set(tp, SHORT_DMA_BUG);
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
--
1.7.10.2