diff options
| author |   Guo-Fu Tseng <cooldavid@cooldavid.org> | 2011-02-13 18:27:34 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-02-13 20:43:20 -0800 |
| commit | 19d96017d1b5b1c9b709bc21a398ea793256644c (patch) | |
| tree | 646eb220082285d32e7530dcc6260c881d69c1cb /drivers/net/jme.c | |
| parent | bridge: implement [add/del]_slave ops (diff) | |
| download | linux-dev-19d96017d1b5b1c9b709bc21a398ea793256644c.tar.xz linux-dev-19d96017d1b5b1c9b709bc21a398ea793256644c.zip | |
jme: Extract main and sub chip revision
Get the main and sub chip revision for later workaround use.
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
| -rw-r--r-- | drivers/net/jme.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index e97ebef3cf47..d44716e804b6 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -2731,6 +2731,8 @@ jme_check_hw_ver(struct jme_adapter *jme) jme->fpgaver = (chipmode & CM_FPGAVER_MASK) >> CM_FPGAVER_SHIFT; jme->chiprev = (chipmode & CM_CHIPREV_MASK) >> CM_CHIPREV_SHIFT; + jme->chip_main_rev = jme->chiprev & 0xF; + jme->chip_sub_rev = (jme->chiprev >> 4) & 0xF; } static const struct net_device_ops jme_netdev_ops = { @@ -2937,7 +2939,7 @@ jme_init_one(struct pci_dev *pdev, jme_clear_pm(jme); jme_set_phyfifoa(jme); - pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->rev); + pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev); if (!jme->fpgaver) jme_phy_init(jme); jme_phy_off(jme); @@ -2964,14 +2966,14 @@ jme_init_one(struct pci_dev *pdev, goto err_out_unmap; } - netif_info(jme, probe, jme->dev, "%s%s ver:%x rev:%x macaddr:%pM\n", + netif_info(jme, probe, jme->dev, "%s%s chiprev:%x pcirev:%x macaddr:%pM\n", (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ? "JMC250 Gigabit Ethernet" : (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ? "JMC260 Fast Ethernet" : "Unknown", (jme->fpgaver != 0) ? " (FPGA)" : "", (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, - jme->rev, netdev->dev_addr); + jme->pcirev, netdev->dev_addr); return 0; |