From 86f34b37cb861c3e537c15b21478a12159456daa Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 12 Nov 2007 21:11:51 -0800 Subject: [PATCH] --- yaml --- r: 73607 b: refs/heads/master c: e875093c9659d2a9f3923aa9ee1b89ef40cf95b9 h: refs/heads/master i: 73605: a3615c24ede0e25364fac4612b627d57dcbcca4d 73603: 32cd5e7a62d154e03fcbeba9ccb3e970cdab23ed 73599: 43f5df7b009259f18367af3174212ca916f2d8ac v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4b908661fc6f..aca81be89504 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5767dec1980463aef5614b7ad8a800bb4f4c353 +refs/heads/master: e875093c9659d2a9f3923aa9ee1b89ef40cf95b9 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index ef849b1eb110..25e57d8ddb51 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -9354,7 +9354,8 @@ static int tg3_test_loopback(struct tg3 *tp) if (err) return TG3_LOOPBACK_FAILED; - if (tp->tg3_flags & TG3_FLAG_CPMU_PRESENT) { + if (tp->pci_chip_rev_id == CHIPREV_ID_5784_A0 || + tp->pci_chip_rev_id == CHIPREV_ID_5761_A0) { int i; u32 status; @@ -9371,17 +9372,18 @@ static int tg3_test_loopback(struct tg3 *tp) if (status != CPMU_MUTEX_GNT_DRIVER) return TG3_LOOPBACK_FAILED; - cpmuctrl = tr32(TG3_CPMU_CTRL); - /* Turn off power management based on link speed. */ + cpmuctrl = tr32(TG3_CPMU_CTRL); tw32(TG3_CPMU_CTRL, - cpmuctrl & ~CPMU_CTRL_LINK_SPEED_MODE); + cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE | + CPMU_CTRL_LINK_AWARE_MODE)); } if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK)) err |= TG3_MAC_LOOPBACK_FAILED; - if (tp->tg3_flags & TG3_FLAG_CPMU_PRESENT) { + if (tp->pci_chip_rev_id == CHIPREV_ID_5784_A0 || + tp->pci_chip_rev_id == CHIPREV_ID_5761_A0) { tw32(TG3_CPMU_CTRL, cpmuctrl); /* Release the mutex */