Fix for Sun HME (PCI ROM mapping fix) that fixes NULL MAC address.

diff --git a/queue/series b/queue/series
index fc1f0d384d6ff2db275f8d4d964a6f3aed4e4997..d59e0c94718ca9f0de3e0f46ef290f60f4b79d6d 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -1,3 +1,4 @@
 forcedeth-init-link-settings-in-nv_open.patch
 hpt366-write-dword-not-byte-for-ROM-resource.patch
 sungem-enable-and-map-pci-rom-properly.patch
+sunhme-enable-and-map-pci-rom-properly.patch

diff --git a/queue/sunhme-enable-and-map-pci-rom-properly.patch b/queue/sunhme-enable-and-map-pci-rom-properly.patch
new file mode 100644 (file)
index 0000000..3fc6dc5
--- /dev/null
+++ b/queue/sunhme-enable-and-map-pci-rom-properly.patch
@@ -0,0 +1,95 @@
+From stable-bounces@linux.kernel.org  Sun Sep 11 14:10:11 2005
+Date: Sun, 11 Sep 2005 14:10:02 -0700 (PDT)
+From: Linus Torvalds <torvalds@osdl.org>
+To: stable@kernel.org
+Cc: 
+Subject: [stable] [ROM 3/3] Sun HME: enable and map PCI ROM properly
+
+From: Willy Tarreau <willy@w.ods.org>
+
+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>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+ drivers/net/sunhme.c |   45 ++++++++++++++++++---------------------------
+ 1 files changed, 18 insertions(+), 27 deletions(-)
+
+Index: linux-2.6.13.y/drivers/net/sunhme.c
+===================================================================
+--- linux-2.6.13.y.orig/drivers/net/sunhme.c
++++ linux-2.6.13.y/drivers/net/sunhme.c
+@@ -2954,7 +2954,7 @@ static int is_quattro_p(struct pci_dev *
+ }
+ 
+ /* 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 __
+ 
+                       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;
++
++              if (is_quattro_p(pdev))
++                      index = PCI_SLOT(pdev->devfn);
++
++              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;
+       }
+ 
+-      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);
+-
+-      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;
+-
+-use_random:
+       /* Sun MAC prefix then 3 random bytes. */
+       dev_addr[0] = 0x08;
+       dev_addr[1] = 0x00;