Module Name: src
Committed By: msaitoh
Date: Thu Apr 20 09:03:05 UTC 2017
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Fix device timeout problem when MSI is used on BCM57762, BCM57765 and
BCM57785. Check correctly for BGEF_TAGGED_STATUS. These devices' ASCI core is
BCM5776[56]. Other BSD's BGE_IS_5717_PLUS() include BCM5776[56] but ours
doesn't (because Linux tg3 does so).
Tested with snj's MacBook (BCM57765 (BCM57765 B0 ASIC)) and my Acer Aspire
One 756 (BCM57785(BCM57765 B0 ASIC)). Also Thunderbolt Ethernet
(BCM57762 (BCM57766 A0 ASIC)) should work.
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.306 src/sys/dev/pci/if_bge.c:1.307
--- src/sys/dev/pci/if_bge.c:1.306 Thu Apr 13 09:25:33 2017
+++ src/sys/dev/pci/if_bge.c Thu Apr 20 09:03:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.306 2017/04/13 09:25:33 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.306 2017/04/13 09:25:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3785,7 +3785,7 @@ alloc_retry:
* we use tagged status only for MSI case on BCM5717. Otherwise
* MSI on BCM5717 does not work.
*/
- if (BGE_IS_5717_PLUS(sc) && sc->bge_flags & BGEF_MSI)
+ if (BGE_IS_57765_PLUS(sc) && sc->bge_flags & BGEF_MSI)
sc->bge_flags |= BGEF_TAGGED_STATUS;
/*
