sky2: use PCI VPD API in eeprom ethtool ops

Recently pci_read/write_vpd_any() have been added to the PCI VPD API.
These functions allow to access VPD address space outside the
auto-detected VPD, and they can be used to significantly simplify the
eeprom ethtool ops.

Tested with a 88E8070 card with 1KB EEPROM.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 28b5b93..d53ce82 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4266,96 +4266,36 @@ static int sky2_get_eeprom_len(struct net_device *dev)
        return 1 << ( ((reg2 & PCI_VPD_ROM_SZ) >> 14) + 8);
 }
 
-static int sky2_vpd_wait(const struct sky2_hw *hw, int cap, u16 busy)
-{
-       unsigned long start = jiffies;
-
-       while ( (sky2_pci_read16(hw, cap + PCI_VPD_ADDR) & PCI_VPD_ADDR_F) == busy) {
-               /* Can take up to 10.6 ms for write */
-               if (time_after(jiffies, start + HZ/4)) {
-                       dev_err(&hw->pdev->dev, "VPD cycle timed out\n");
-                       return -ETIMEDOUT;
-               }
-               msleep(1);
-       }
-
-       return 0;
-}
-
-static int sky2_vpd_read(struct sky2_hw *hw, int cap, void *data,
-                        u16 offset, size_t length)
-{
-       int rc = 0;
-
-       while (length > 0) {
-               u32 val;
-
-               sky2_pci_write16(hw, cap + PCI_VPD_ADDR, offset);
-               rc = sky2_vpd_wait(hw, cap, 0);
-               if (rc)
-                       break;
-
-               val = sky2_pci_read32(hw, cap + PCI_VPD_DATA);
-
-               memcpy(data, &val, min(sizeof(val), length));
-               offset += sizeof(u32);
-               data += sizeof(u32);
-               length -= sizeof(u32);
-       }
-
-       return rc;
-}
-
-static int sky2_vpd_write(struct sky2_hw *hw, int cap, const void *data,
-                         u16 offset, unsigned int length)
-{
-       unsigned int i;
-       int rc = 0;
-
-       for (i = 0; i < length; i += sizeof(u32)) {
-               u32 val = *(u32 *)(data + i);
-
-               sky2_pci_write32(hw, cap + PCI_VPD_DATA, val);
-               sky2_pci_write32(hw, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);
-
-               rc = sky2_vpd_wait(hw, cap, PCI_VPD_ADDR_F);
-               if (rc)
-                       break;
-       }
-       return rc;
-}
-
 static int sky2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                           u8 *data)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
-       int cap = pci_find_capability(sky2->hw->pdev, PCI_CAP_ID_VPD);
-
-       if (!cap)
-               return -EINVAL;
+       int rc;
 
        eeprom->magic = SKY2_EEPROM_MAGIC;
+       rc = pci_read_vpd_any(sky2->hw->pdev, eeprom->offset, eeprom->len,
+                             data);
+       if (rc < 0)
+               return rc;
+
+       eeprom->len = rc;
 
-       return sky2_vpd_read(sky2->hw, cap, data, eeprom->offset, eeprom->len);
+       return 0;
 }
 
 static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                           u8 *data)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
-       int cap = pci_find_capability(sky2->hw->pdev, PCI_CAP_ID_VPD);
-
-       if (!cap)
-               return -EINVAL;
+       int rc;
 
        if (eeprom->magic != SKY2_EEPROM_MAGIC)
                return -EINVAL;
 
-       /* Partial writes not supported */
-       if ((eeprom->offset & 3) || (eeprom->len & 3))
-               return -EINVAL;
+       rc = pci_write_vpd_any(sky2->hw->pdev, eeprom->offset, eeprom->len,
+                              data);
 
-       return sky2_vpd_write(sky2->hw, cap, data, eeprom->offset, eeprom->len);
+       return rc < 0 ? rc : 0;
 }
 
 static netdev_features_t sky2_fix_features(struct net_device *dev,