Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

[safe/jmp/linux-2.6] / drivers / net / sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4e3e2a3..3813d15 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3034,7 +3034,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
        struct sky2_port *sky2 = netdev_priv(dev);
        struct sky2_hw *hw = sky2->hw;
 
-       if (wol->wolopts & ~sky2_wol_supported(sky2->hw))
+       if ((wol->wolopts & ~sky2_wol_supported(sky2->hw))
+           || !device_can_wakeup(&hw->pdev->dev))
                return -EOPNOTSUPP;
 
        sky2->wol = wol->wolopts;
@@ -3045,6 +3046,8 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
                sky2_write32(hw, B0_CTST, sky2->wol
                             ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);
 
+       device_set_wakeup_enable(&hw->pdev->dev, sky2->wol);
+
        if (!netif_running(dev))
                sky2_wol_init(sky2);
        return 0;
@@ -4179,16 +4182,67 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
        return err;
 }
 
-static int __devinit pci_wake_enabled(struct pci_dev *dev)
-{
-       int pm  = pci_find_capability(dev, PCI_CAP_ID_PM);
-       u16 value;
+/*
+ * Read and parse the first part of Vital Product Data
+ */
+#define VPD_SIZE       128
+#define VPD_MAGIC      0x82
+
+static void __devinit sky2_vpd_info(struct sky2_hw *hw)
+{
+       int cap = pci_find_capability(hw->pdev, PCI_CAP_ID_VPD);
+       const u8 *p;
+       u8 *vpd_buf = NULL;
+       u16 len;
+       static struct vpd_tag {
+               char tag[2];
+               char *label;
+       } vpd_tags[] = {
+               { "PN", "Part Number" },
+               { "EC", "Engineering Level" },
+               { "MN", "Manufacturer" },
+       };
 
-       if (!pm)
-               return 0;
-       if (pci_read_config_word(dev, pm + PCI_PM_CTRL, &value))
-               return 0;
-       return value & PCI_PM_CTRL_PME_ENABLE;
+       if (!cap)
+               goto out;
+
+       vpd_buf = kmalloc(VPD_SIZE, GFP_KERNEL);
+       if (!vpd_buf)
+               goto out;
+
+       if (sky2_vpd_read(hw, cap, vpd_buf, 0, VPD_SIZE))
+               goto out;
+
+       if (vpd_buf[0] != VPD_MAGIC)
+               goto out;
+       len = vpd_buf[1];
+       if (len == 0 || len > VPD_SIZE - 4)
+               goto out;
+       p = vpd_buf + 3;
+       dev_info(&hw->pdev->dev, "%.*s\n", len, p);
+       p += len;
+
+       while (p < vpd_buf + VPD_SIZE - 4) {
+               int i;
+
+               if (!memcmp("RW", p, 2))        /* end marker */
+                       break;
+
+               len = p[2];
+               if (len > (p - vpd_buf) - 4)
+                       break;
+
+               for (i = 0; i < ARRAY_SIZE(vpd_tags); i++) {
+                       if (!memcmp(vpd_tags[i].tag, p, 2)) {
+                               printk(KERN_DEBUG " %s: %.*s\n",
+                                      vpd_tags[i].label, len, p + 3);
+                               break;
+                       }
+               }
+               p += len + 3;
+       }
+out:
+       kfree(vpd_buf);
 }
 
 /* This driver supports yukon2 chipset only */
@@ -4251,7 +4305,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                }
        }
 
-       wol_default = pci_wake_enabled(pdev) ? WAKE_MAGIC : 0;
+       wol_default = device_may_wakeup(&pdev->dev) ? WAKE_MAGIC : 0;
 
        err = -ENOMEM;
        hw = kzalloc(sizeof(*hw), GFP_KERNEL);
@@ -4289,13 +4343,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
        if (err)
                goto err_out_iounmap;
 
-       dev_info(&pdev->dev, "v%s addr 0x%llx irq %d Yukon-2 %s rev %d\n",
-                DRV_VERSION, (unsigned long long)pci_resource_start(pdev, 0),
-                pdev->irq, sky2_name(hw->chip_id, buf1, sizeof(buf1)),
-                hw->chip_rev);
+       dev_info(&pdev->dev, "Yukon-2 %s chip revision %d\n",
+                sky2_name(hw->chip_id, buf1, sizeof(buf1)), hw->chip_rev);
 
        sky2_reset(hw);
 
+       sky2_vpd_info(hw);
+
        dev = sky2_init_netdev(hw, 0, using_dac, wol_default);
        if (!dev) {
                err = -ENOMEM;
@@ -4546,6 +4600,8 @@ static struct pci_driver sky2_driver = {
 
 static int __init sky2_init_module(void)
 {
+       pr_info(PFX "driver version " DRV_VERSION "\n");
+
        sky2_debug_init();
        return pci_register_driver(&sky2_driver);
 }