Import jme 0.9d source

diff --git a/jme.c b/jme.c
index 612a0585240201ed719add5d8cfe3ca27ef5f846..f44a3cc8bb10459427beb6603a79f87ceb3a1555 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -98,8 +98,7 @@ jme_mdio_write(struct net_device *netdev,
        wmb();
        for (i = JME_PHY_TIMEOUT * 50 ; i > 0 ; --i) {
                udelay(20);
        wmb();
        for (i = JME_PHY_TIMEOUT * 50 ; i > 0 ; --i) {
                udelay(20);

-               val = jread32(jme, JME_SMI);
-               if ((val & SMI_OP_REQ) == 0)
+               if ((jread32(jme, JME_SMI) & SMI_OP_REQ) == 0)

                        break;
        }
 
                        break;
        }
 


@@ -119,10 +118,11 @@ jme_reset_phy_processor(struct jme_adapter *jme)
                        MII_ADVERTISE, ADVERTISE_ALL |
                        ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
 
                        MII_ADVERTISE, ADVERTISE_ALL |
                        ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
 

-       jme_mdio_write(jme->dev,
-                       jme->mii_if.phy_id,
-                       MII_CTRL1000,
-                       ADVERTISE_1000FULL | ADVERTISE_1000HALF);
+       if(jme->pdev->device == JME_GE_DEVICE)
+               jme_mdio_write(jme->dev,
+                               jme->mii_if.phy_id,
+                               MII_CTRL1000,
+                               ADVERTISE_1000FULL | ADVERTISE_1000HALF);

 
        val = jme_mdio_read(jme->dev,
                                jme->mii_if.phy_id,
 
        val = jme_mdio_read(jme->dev,
                                jme->mii_if.phy_id,


@@ -331,7 +331,7 @@ jme_linkstat_from_phy(struct jme_adapter *jme)
 
        phylink = jme_mdio_read(jme->dev, jme->mii_if.phy_id, 17);
        bmsr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMSR);
 
        phylink = jme_mdio_read(jme->dev, jme->mii_if.phy_id, 17);
        bmsr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMSR);

-       if(bmsr & BMCR_ANCOMP)
+       if(bmsr & BMSR_ANCOMP)

                phylink |= PHY_LINK_AUTONEG_COMPLETE;
 
        return phylink;
                phylink |= PHY_LINK_AUTONEG_COMPLETE;
 
        return phylink;


@@ -1794,7 +1794,7 @@ jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
        txbi->skb = skb;
        txbi->len = skb->len;
        if(!(txbi->start_xmit = jiffies))
        txbi->skb = skb;
        txbi->len = skb->len;
        if(!(txbi->start_xmit = jiffies))

-               txbi->start_xmit = 1;
+               txbi->start_xmit = (0UL-1);

 
        return 0;
 }
 
        return 0;
 }


@@ -2457,7 +2457,7 @@ jme_get_eeprom(struct net_device *netdev,
        int i, offset = eeprom->offset, len = eeprom->len;
 
        /*
        int i, offset = eeprom->offset, len = eeprom->len;
 
        /*

-        * ethtool will check boundary for us
+        * ethtool will check the boundary for us

         */
        eeprom->magic = JME_EEPROM_MAGIC;
        for(i = 0 ; i < len ; ++i)
         */
        eeprom->magic = JME_EEPROM_MAGIC;
        for(i = 0 ; i < len ; ++i)


@@ -2477,7 +2477,7 @@ jme_set_eeprom(struct net_device *netdev,
                return -EINVAL;
 
        /*
                return -EINVAL;
 
        /*

-        * ethtool will check boundary for us
+        * ethtool will check the boundary for us

         */
        for(i = 0 ; i < len ; ++i)
                jme_smb_write(jme, i + offset, data[i]);
         */
        for(i = 0 ; i < len ; ++i)
                jme_smb_write(jme, i + offset, data[i]);


@@ -2689,7 +2689,10 @@ jme_init_one(struct pci_dev *pdev,
                     (unsigned long) jme);
        jme->dpi.cur = PCC_P1;
 
                     (unsigned long) jme);
        jme->dpi.cur = PCC_P1;
 

-       jme->reg_ghc = GHC_DPX | GHC_SPEED_1000M;
+       if(pdev->device == JME_GE_DEVICE)
+               jme->reg_ghc = GHC_DPX | GHC_SPEED_1000M;
+       else
+               jme->reg_ghc = GHC_DPX | GHC_SPEED_100M;

        jme->reg_rxcs = RXCS_DEFAULT;
        jme->reg_rxmcs = RXMCS_DEFAULT;
        jme->reg_txpfc = 0;
        jme->reg_rxcs = RXCS_DEFAULT;
        jme->reg_rxmcs = RXMCS_DEFAULT;
        jme->reg_txpfc = 0;


@@ -2740,7 +2743,10 @@ jme_init_one(struct pci_dev *pdev,
        else {
                jme->mii_if.phy_id = 1;
        }
        else {
                jme->mii_if.phy_id = 1;
        }

-       jme->mii_if.supports_gmii = 1;
+       if(pdev->device == JME_GE_DEVICE)
+               jme->mii_if.supports_gmii = true;
+       else
+               jme->mii_if.supports_gmii = false;

        jme->mii_if.mdio_read = jme_mdio_read;
        jme->mii_if.mdio_write = jme_mdio_write;
 
        jme->mii_if.mdio_read = jme_mdio_read;
        jme->mii_if.mdio_write = jme_mdio_write;
 


@@ -2914,7 +2920,8 @@ jme_resume(struct pci_dev *pdev)
 }
 
 static struct pci_device_id jme_pci_tbl[] = {
 }
 
 static struct pci_device_id jme_pci_tbl[] = {

-       { PCI_VDEVICE(JMICRON, 0x250) },
+       { PCI_VDEVICE(JMICRON, JME_GE_DEVICE) },
+       { PCI_VDEVICE(JMICRON, JME_FE_DEVICE) },

        { }
 };
 
        { }
 };
 

diff --git a/jme.h b/jme.h
index 57a270bb57e1c8d86793833effd1b2311c8ac7fd..944cf631438db978ff95c4e7e79d6ac28c392366 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -24,9 +24,12 @@
 #include <linux/version.h>
 
 #define DRV_NAME       "jme"
 #include <linux/version.h>
 
 #define DRV_NAME       "jme"

-#define DRV_VERSION    "0.9c"
+#define DRV_VERSION    "0.9d"

 #define PFX DRV_NAME   ": "
 
 #define PFX DRV_NAME   ": "
 

+#define JME_GE_DEVICE 0x250
+#define JME_FE_DEVICE 0x260
+

 #ifdef DEBUG
 #define dprintk(devname, fmt, args...) \
         printk(KERN_DEBUG "%s: " fmt, devname, ## args)
 #ifdef DEBUG
 #define dprintk(devname, fmt, args...) \
         printk(KERN_DEBUG "%s: " fmt, devname, ## args)


@@ -774,7 +777,7 @@ __always_inline __u32 smi_phy_addr(int x)
 {
         return (((x) << SMI_PHY_ADDR_SHIFT) & SMI_PHY_ADDR_MASK);
 }
 {
         return (((x) << SMI_PHY_ADDR_SHIFT) & SMI_PHY_ADDR_MASK);
 }

-#define JME_PHY_TIMEOUT 1000 /* 1000 msec */
+#define JME_PHY_TIMEOUT 100 /* 100 msec */

 #define JME_PHY_REG_NR 32
 
 /*
 #define JME_PHY_REG_NR 32
 
 /*


@@ -1056,7 +1059,7 @@ enum jme_phy_reg17_vals {
        PREG17_SPEED_100M       = 0x4000,
        PREG17_SPEED_1000M      = 0x8000,
 };
        PREG17_SPEED_100M       = 0x4000,
        PREG17_SPEED_1000M      = 0x8000,
 };

-#define BMCR_ANCOMP               0x0020
+#define BMSR_ANCOMP               0x0020

 
 /*
  * Function prototypes for ethtool
 
 /*
  * Function prototypes for ethtool