diff options
| author |   Matt Carlson <mcarlson@broadcom.com> | 2009-02-25 14:27:20 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-02-26 23:16:39 -0800 |
| commit | 7fd764455a13f4d9b37c9b908f07d0758f11d3c5 (patch) | |
| tree | 6a4c4b911c8fb1b7201e1b328e59486b72d22ed5 /drivers/net/tg3.c | |
| parent | tg3: Add legacy bootcode version decoding (diff) | |
| download | linux-dev-7fd764455a13f4d9b37c9b908f07d0758f11d3c5.tar.xz linux-dev-7fd764455a13f4d9b37c9b908f07d0758f11d3c5.zip | |
tg3: Add DASH firmware version reporting
This patch adds code to report the DASH firmware version.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 43859e4db2fe..bbf5fe3db3c8 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -11606,6 +11606,34 @@ static void __devinit tg3_read_mgmtfw_ver(struct tg3 *tp) } } +static void __devinit tg3_read_dash_ver(struct tg3 *tp) +{ + int vlen; + u32 apedata; + + if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) || + !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) + return; + + apedata = tg3_ape_read32(tp, TG3_APE_SEG_SIG); + if (apedata != APE_SEG_SIG_MAGIC) + return; + + apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS); + if (!(apedata & APE_FW_STATUS_READY)) + return; + + apedata = tg3_ape_read32(tp, TG3_APE_FW_VERSION); + + vlen = strlen(tp->fw_ver); + + snprintf(&tp->fw_ver[vlen], TG3_VER_SIZE - vlen, " DASH v%d.%d.%d.%d", + (apedata & APE_FW_VERSION_MAJMSK) >> APE_FW_VERSION_MAJSFT, + (apedata & APE_FW_VERSION_MINMSK) >> APE_FW_VERSION_MINSFT, + (apedata & APE_FW_VERSION_REVMSK) >> APE_FW_VERSION_REVSFT, + (apedata & APE_FW_VERSION_BLDMSK)); +} + static void __devinit tg3_read_fw_ver(struct tg3 *tp) { u32 val; @@ -13279,6 +13307,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, } tg3_ape_lock_init(tp); + + if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) + tg3_read_dash_ver(tp); } /* |