[PATCH] Sun HME: enable and map PCI ROM properly

This ports the Sun GEM ROM mapping/enable fixes it sunhme (which used
the same PCI ROM mapping code).

Without this, I get NULL MAC addresses for all 4 ports (it's a SUN QFE).
With it, I get the correct addresses (the ones printed on the label on
the card).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 17 insertions, 26 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index f02fe4119b2..9f046cae2f7 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2954,7 +2954,7 @@ static int is_quattro_p(struct pci_dev *pdev)
 }
 
 /* Fetch MAC address from vital product data of PCI ROM. */
-static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, int index, unsigned char *dev_addr)
+static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, int index, unsigned char *dev_addr)
 {
         int this_offset;
 
@@ -2977,42 +2977,33 @@ static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, int index, uns
 
                         for (i = 0; i < 6; i++)
                                 dev_addr[i] = readb(p + i);
-                        break;
+                        return 1;
                 }
                 index--;
         }
+        return 0;
 }
 
 static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
 {
-        u32 rom_reg_orig;
-        void __iomem *p;
-        int index;
+        size_t size;
+        void __iomem *p = pci_map_rom(pdev, &size);
 
-        index = 0;
-        if (is_quattro_p(pdev))
-                index = PCI_SLOT(pdev->devfn);
-
-        if (pdev->resource[PCI_ROM_RESOURCE].parent == NULL) {
-                if (pci_assign_resource(pdev, PCI_ROM_RESOURCE) < 0)
-                        goto use_random;
-        }
+        if (p) {
+                int index = 0;
+                int found;
 
-        pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_reg_orig);
-        pci_write_config_dword(pdev, pdev->rom_base_reg,
-                               rom_reg_orig | PCI_ROM_ADDRESS_ENABLE);
+                if (is_quattro_p(pdev))
+                        index = PCI_SLOT(pdev->devfn);
 
-        p = ioremap(pci_resource_start(pdev, PCI_ROM_RESOURCE), (64 * 1024));
-        if (p != NULL && readb(p) == 0x55 && readb(p + 1) == 0xaa)
-                find_eth_addr_in_vpd(p, (64 * 1024), index, dev_addr);
-
-        if (p != NULL)
-                iounmap(p);
-
-        pci_write_config_dword(pdev, pdev->rom_base_reg, rom_reg_orig);
-        return;
+                found = readb(p) == 0x55 &&
+                        readb(p + 1) == 0xaa &&
+                        find_eth_addr_in_vpd(p, (64 * 1024), index, dev_addr);
+                pci_unmap_rom(pdev, p);
+                if (found)
+                        return;
+        }
 
-use_random:
         /* Sun MAC prefix then 3 random bytes. */
         dev_addr[0] = 0x08;
         dev_addr[1] = 0x00;