 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $	*/
+/*	$NetBSD: if_cemac.c,v 1.6 2015/08/24 18:40:57 rjs Exp $	*/
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * Based on arch/arm/at91/at91emac.c
+ *
  * Copyright (c) 2007 Embedtronics Oy
  * All rights reserved.
+ *
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
 @@ -30,27 +30,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Cadence EMAC/GEM ethernet controller IP driver
  * used by arm/at91, arm/zynq SoC
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.6 2015/08/24 18:40:57 rjs Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -939,85 +939,89 @@ cemac_setaddr(struct ifnet *ifp)
 	ifp->if_flags &= ~IFF_ALLMULTI;
 	ETHER_FIRST_MULTI(step, ac, enm);
 	while (enm != NULL) {
 		if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
 			/*
 			 * We must listen to a range of multicast addresses.
 			 * For now, just accept all multicasts, rather than
 			 * trying to set only those filter bits needed to match
 			 * the range.  (At this time, the only use of address
 			 * ranges is for IP multicast routing, for which the
 			 * range is big enough to require all bits set.)
 			 */
-			cfg |= ETH_CFG_CAF;
+			cfg |= ETH_CFG_MTI;
 			hashes[0] = 0xffffffffUL;
 			hashes[1] = 0xffffffffUL;
 			ifp->if_flags |= IFF_ALLMULTI;
 			nma = 0;
 			break;
+		}
 		if (nma < 3) {
 			/* We can program 3 perfect address filters for mcast */
 			memcpy(ias[nma], enm->enm_addrlo, ETHER_ADDR_LEN);
 		} else {
 			/*
 			 * XXX: Datasheet is not very clear here, I'm not sure
 			 * if I'm doing this right.  --joff
 			 */
 			h = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
 			/* Just want the 6 most-significant bits. */
 			h = h >> 26;
 #if 0
 			hashes[h / 32] |=  (1 << (h % 32));
 #else
 			hashes[0] = 0xffffffffUL;
 			hashes[1] = 0xffffffffUL;
 #endif
 			cfg |= ETH_CFG_MTI;
+		}
 		ETHER_NEXT_MULTI(step, enm);
 		nma++;
+	}
 	// program...
 	DPRINTFN(1,("%s: en0 %02x:%02x:%02x:%02x:%02x:%02x\n", __FUNCTION__,
 		sc->sc_enaddr[0], sc->sc_enaddr[1], sc->sc_enaddr[2],
 		sc->sc_enaddr[3], sc->sc_enaddr[4], sc->sc_enaddr[5]));
 	CEMAC_GEM_WRITE(SA1L, (sc->sc_enaddr[3] << 24)
 	    | (sc->sc_enaddr[2] << 16) | (sc->sc_enaddr[1] << 8)
 	    | (sc->sc_enaddr[0]));
 	CEMAC_GEM_WRITE(SA1H, (sc->sc_enaddr[5] << 8)
 	    | (sc->sc_enaddr[4]));
-	if (nma > 1) {
+	if (nma > 0) {
 		DPRINTFN(1,("%s: en1 %02x:%02x:%02x:%02x:%02x:%02x\n", __FUNCTION__,
 			ias[0][0], ias[0][1], ias[0][2],
 			ias[0][3], ias[0][4], ias[0][5]));
 		CEMAC_WRITE(ETH_SA2L, (ias[0][3] << 24)
 		    | (ias[0][2] << 16) | (ias[0][1] << 8)
 		    | (ias[0][0]));
 		CEMAC_WRITE(ETH_SA2H, (ias[0][4] << 8)
 		    | (ias[0][5]));
+	}
-	if (nma > 2) {
+	if (nma > 1) {
 		DPRINTFN(1,("%s: en2 %02x:%02x:%02x:%02x:%02x:%02x\n", __FUNCTION__,
 			ias[1][0], ias[1][1], ias[1][2],
 			ias[1][3], ias[1][4], ias[1][5]));
 		CEMAC_WRITE(ETH_SA3L, (ias[1][3] << 24)
 		    | (ias[1][2] << 16) | (ias[1][1] << 8)
 		    | (ias[1][0]));
 		CEMAC_WRITE(ETH_SA3H, (ias[1][4] << 8)
 		    | (ias[1][5]));
+	}
-	if (nma > 3) {
+	if (nma > 2) {
 		DPRINTFN(1,("%s: en3 %02x:%02x:%02x:%02x:%02x:%02x\n", __FUNCTION__,
 			ias[2][0], ias[2][1], ias[2][2],
 			ias[2][3], ias[2][4], ias[2][5]));
-		CEMAC_WRITE(ETH_SA3L, (ias[2][3] << 24)
+		CEMAC_WRITE(ETH_SA4L, (ias[2][3] << 24)
 		    | (ias[2][2] << 16) | (ias[2][1] << 8)
 		    | (ias[2][0]));
-		CEMAC_WRITE(ETH_SA3H, (ias[2][4] << 8)
+		CEMAC_WRITE(ETH_SA4H, (ias[2][4] << 8)
 		    | (ias[2][5]));
+	}
 	CEMAC_GEM_WRITE(HSH, hashes[0]);
 	CEMAC_GEM_WRITE(HSL, hashes[1]);
 	CEMAC_WRITE(ETH_CFG, cfg);
 	CEMAC_WRITE(ETH_CTL, ctl | ETH_CTL_RE);
+}