remove the small amount of code for Yukon-2 chipsets now that there is msk(4).

1 files changed, 5 insertions, 121 deletions

diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index a81f30d2c98..fa9f59adeea 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.130 2006/11/08 21:04:41 kettenis Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.131 2006/11/16 03:05:29 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -452,10 +452,6 @@ sk_setmulti(struct sk_if_softc *sc_if)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH1, 0);
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH2, 0);
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH3, 0);
@@ -496,10 +492,6 @@ allmulti:
 				case SK_YUKON:
 				case SK_YUKON_LITE:
 				case SK_YUKON_LP:
-				case SK_YUKON_XL:
-				case SK_YUKON_EC_U:
-				case SK_YUKON_EC:
-				case SK_YUKON_FE:
 					h = sk_yukon_hash(enm->enm_addrlo);
 					break;
 				}
@@ -523,10 +515,6 @@ allmulti:
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH1, hashes[0] & 0xffff);
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH2, (hashes[0] >> 16) & 0xffff);
 		SK_YU_WRITE_2(sc_if, YUKON_MCAH3, hashes[1] & 0xffff);
@@ -551,10 +539,6 @@ sk_setpromisc(struct sk_if_softc *sc_if)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		if (ifp->if_flags & IFF_PROMISC) {
 			SK_YU_CLRBIT_2(sc_if, YUKON_RCR,
 			    YU_RCR_UFLEN | YU_RCR_MUFLEN);
@@ -1024,11 +1008,6 @@ void sk_reset(struct sk_softc *sc)
 	case SK_GENESIS:
 		imtimer_ticks = SK_IMTIMER_TICKS_GENESIS;
 		break;
-	case SK_YUKON_EC:
-	case SK_YUKON_XL:
-	case SK_YUKON_FE:
-		imtimer_ticks = SK_IMTIMER_TICKS_YUKON_EC;
-		break;
 	default:
 		imtimer_ticks = SK_IMTIMER_TICKS_YUKON;
 	}
@@ -1051,12 +1030,6 @@ sk_probe(struct device *parent, void *match, void *aux)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-#ifdef not_quite_yet
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
-#endif
 		return (1);
 	}
 
@@ -1112,12 +1085,8 @@ sk_attach(struct device *parent, struct device *self, void *aux)
  	 * receiver and b) between the two XMACs, if this is a
 	 * dual port NIC. Our algorithm is to divide up the memory
 	 * evenly so that everyone gets a fair share.
-	 *
-	 * Just to be contrary, Yukon2 appears to have separate memory
-	 * for each MAC.
 	 */
-	if (SK_IS_YUKON2(sc) ||
-	    sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC) {
+	if (sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC) {
 		u_int32_t		chunk, val;
 
 		chunk = sc->sk_ramsize / 2;
@@ -1237,10 +1206,6 @@ sk_attach(struct device *parent, struct device *self, void *aux)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		sk_init_yukon(sc_if);
 		break;
 	default:
@@ -1454,9 +1419,7 @@ skc_attach(struct device *parent, struct device *self, void *aux)
 	/* Read and save physical media type */
 	sc->sk_pmd = sk_win_read_1(sc, SK_PMDTYPE);
 
-	if (sc->sk_pmd == 'T' || sc->sk_pmd == '1' ||
-	    (SK_IS_YUKON2(sc) && !(sc->sk_pmd == 'L' ||
-	    sc->sk_pmd == 'S')))
+	if (sc->sk_pmd == 'T' || sc->sk_pmd == '1')
 		sc->sk_coppertype = 1;
 	else
 		sc->sk_coppertype = 0;
@@ -1474,18 +1437,6 @@ skc_attach(struct device *parent, struct device *self, void *aux)
 	case SK_YUKON_LP:
 		sc->sk_name = "Marvell Yukon LP";
 		break;
-	case SK_YUKON_XL:
-		sc->sk_name = "Marvell Yukon-2 XL";
-		break;
-	case SK_YUKON_EC_U:
-		sc->sk_name = "Marvell Yukon-2 EC Ultra";
-		break;
-	case SK_YUKON_EC:
-		sc->sk_name = "Marvell Yukon-2 EC";
-		break;
-	case SK_YUKON_FE:
-		sc->sk_name = "Marvell Yukon-2 FE";
-		break;
 	default:
 		sc->sk_name = "Marvell Yukon (Unknown)";
 	}
@@ -1526,54 +1477,6 @@ skc_attach(struct device *parent, struct device *self, void *aux)
 		}
 	}
 
-	if (sc->sk_type == SK_YUKON_XL) {
-		switch (sc->sk_rev) {
-		case SK_YUKON_XL_REV_A0:
-			revstr = "A0";
-			break;
-		case SK_YUKON_XL_REV_A1:
-			revstr = "A1";
-			break;
-		case SK_YUKON_XL_REV_A2:
-			revstr = "A2";
-			break;
-		case SK_YUKON_XL_REV_A3:
-			revstr = "A3";
-			break;
-		default:
-			;
-		}
-	}
-
-	if (sc->sk_type == SK_YUKON_EC) {
-		switch (sc->sk_rev) {
-		case SK_YUKON_EC_REV_A1:
-			revstr = "A1";
-			break;
-		case SK_YUKON_EC_REV_A2:
-			revstr = "A2";
-			break;
-		case SK_YUKON_EC_REV_A3:
-			revstr = "A3";
-			break;
-		default:
-			;
-		}
-	}
-
-	if (sc->sk_type == SK_YUKON_EC_U) {
-		switch (sc->sk_rev) {
-		case SK_YUKON_EC_U_REV_A0:
-			revstr = "A0";
-			break;
-		case SK_YUKON_EC_U_REV_A1:
-			revstr = "A1";
-			break;
-		default:
-			;
-		}
-	}
-
 	/* Announce the product name. */
 	printf(", %s", sc->sk_name);
 	if (revstr != NULL)
@@ -1582,19 +1485,8 @@ skc_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sk_macs = 1;
 
-	if (SK_IS_YUKON2(sc)) {
-		u_int8_t hw;
-
-		hw = sk_win_read_1(sc, SK_Y2_HWRES);
-		if ((hw & SK_Y2_HWRES_LINK_MASK) == SK_Y2_HWRES_LINK_DUAL) {
-			if ((sk_win_read_1(sc, SK_Y2_CLKGATE) &
-			    SK_Y2_CLKGATE_LINK2_INACTIVE) == 0)
-				sc->sk_macs++;
-		}
-	} else {
-		if (!(sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC))
-			sc->sk_macs++;
-	}
+	if (!(sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC))
+		sc->sk_macs++;
 
 	skca.skc_port = SK_PORT_A;
 	skca.skc_type = sc->sk_type;
@@ -2677,10 +2569,6 @@ sk_init(void *xsc_if)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		sk_init_yukon(sc_if);
 		break;
 	}
@@ -2856,10 +2744,6 @@ sk_stop(struct sk_if_softc *sc_if)
 	case SK_YUKON:
 	case SK_YUKON_LITE:
 	case SK_YUKON_LP:
-	case SK_YUKON_XL:
-	case SK_YUKON_EC_U:
-	case SK_YUKON_EC:
-	case SK_YUKON_FE:
 		SK_IF_WRITE_1(sc_if,0, SK_RXMF1_CTRL_TEST, SK_RFCTL_RESET_SET);
 		SK_IF_WRITE_1(sc_if,0, SK_TXMF1_CTRL_TEST, SK_TFCTL_RESET_SET);
 		break;