[src/trunk]: src/sys/dev/pci Fix a bug that all ports' MAC address become the...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0d9c0a3e6bc
branches:  trunk
changeset: 448617:d0d9c0a3e6bc
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Feb 06 04:14:03 2019 +0000

description:
Fix a bug that all ports' MAC address become the last port's address on
Non-OF environment.

 The Saturn multi port card has only one VPD ROM and all ports share it.
If the card has four port, it has four "local-mac-address" entries.
Before this commit, the code keep the last one and use it for all ports.
The Saturn four port card has three bridge.

e.g.
----------------
003:02:0: Intel S21152BA,S21154AE/BE PCI-PCI Bridge (PCI bridge)
004:00:0: Intel S21152BA,S21154AE/BE PCI-PCI Bridge (PCI bridge)
004:04:0: Intel S21152BA,S21154AE/BE PCI-PCI Bridge (PCI bridge)
005:00:0: National Semiconductor Saturn (ethernet network, revision 0x30)
005:01:0: National Semiconductor Saturn (ethernet network, revision 0x30)
006:02:0: National Semiconductor Saturn (ethernet network, revision 0x30)
006:03:0: National Semiconductor Saturn (ethernet network, revision 0x30)
----------------

The card assign each port's PCI device number to match the port number.
Use it as the offset of "local-mac-address". Almost the same as FreeBSD.

OK'd by mrg and martin.

diffstat:

 sys/dev/pci/if_cas.c |  28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diffs (73 lines):

diff -r 165d4dda1172 -r d0d9c0a3e6bc sys/dev/pci/if_cas.c
--- a/sys/dev/pci/if_cas.c      Wed Feb 06 04:07:31 2019 +0000
+++ b/sys/dev/pci/if_cas.c      Wed Feb 06 04:14:03 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cas.c,v 1.31 2019/02/05 06:17:03 msaitoh Exp $      */
+/*     $NetBSD: if_cas.c,v 1.32 2019/02/06 04:14:03 msaitoh Exp $      */
 /*     $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $    */
 
 /*
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.31 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.32 2019/02/06 04:14:03 msaitoh Exp $");
 
 #ifndef _MODULE
 #include "opt_inet.h"
@@ -203,6 +203,7 @@
        PCI_CLASS_NETWORK               /* class code */
 };
 
+#define CAS_LMA_MAXNUM 4
 int
 cas_pci_enaddr(struct cas_softc *sc, struct pci_attach_args *pa,
     uint8_t *enaddr)
@@ -212,10 +213,11 @@
        bus_space_handle_t romh;
        bus_space_tag_t romt;
        bus_size_t romsize = 0;
+       uint8_t enaddrs[CAS_LMA_MAXNUM][ETHER_ADDR_LEN];
        u_int8_t buf[32], *desc;
        pcireg_t address;
-       int dataoff, vpdoff, len;
-       int rv = -1;
+       int dataoff, vpdoff, len, lma = 0;
+       int i, rv = -1;
 
        if (pci_mapreg_map(pa, PCI_MAPREG_ROM, PCI_MAPREG_TYPE_MEM, 0,
            &romt, &romh, NULL, &romsize))
@@ -297,8 +299,11 @@
                                continue;
                        desc += strlen("local-mac-address") + 1;
                                
-                       memcpy(enaddr, desc, ETHER_ADDR_LEN);
+                       memcpy(enaddrs[lma], desc, ETHER_ADDR_LEN);
+                       lma++;
                        rv = 0;
+                       if (lma == CAS_LMA_MAXNUM)
+                               break;
                }
                break;
 
@@ -306,6 +311,19 @@
                goto fail;
        }
 
+       i = 0;
+       /*
+        * Multi port card has bridge chip. The device number is fixed:
+        * e.g.
+        * p0: 005:00:0
+        * p1: 005:01:0
+        * p2: 006:02:0
+        * p3: 006:03:0
+        */
+       if ((lma > 1) && (pa->pa_device < CAS_LMA_MAXNUM)
+           && (pa->pa_device < lma))
+               i = pa->pa_device;
+       memcpy(enaddr, enaddrs[i], ETHER_ADDR_LEN);
  fail:
        if (romsize != 0)
                bus_space_unmap(romt, romh, romsize);