[Midnightbsd-cvs] src [10070] trunk/sys/dev: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10070
          http://svnweb.midnightbsd.org/src/?rev=10070
Author:   laffer1
Date:     2018-05-27 19:11:47 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/sys/dev/sec/sec.c
    trunk/sys/dev/sec/sec.h
    trunk/sys/dev/sf/if_sf.c
    trunk/sys/dev/sf/if_sfreg.h
    trunk/sys/dev/sf/starfire_rx.h
    trunk/sys/dev/sf/starfire_tx.h

Modified: trunk/sys/dev/sec/sec.c
===================================================================
--- trunk/sys/dev/sec/sec.c	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sec/sec.c	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
  * All rights reserved.
@@ -29,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/sec/sec.c 266152 2014-05-15 16:11:06Z ian $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -199,6 +200,9 @@
 	struct sec_softc *sc;
 	uint64_t id;
 
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
 	if (!ofw_bus_is_compatible(dev, "fsl,sec2.0"))
 		return (ENXIO);
 
@@ -227,6 +231,10 @@
 		device_set_desc(dev, "Freescale Security Engine 3.0");
 		sc->sc_version = 3;
 		break;
+	case SEC_31_ID:
+		device_set_desc(dev, "Freescale Security Engine 3.1");
+		sc->sc_version = 3;
+		break;
 	default:
 		device_printf(dev, "unknown SEC ID 0x%016llx!\n", id);
 		return (ENXIO);

Modified: trunk/sys/dev/sec/sec.h
===================================================================
--- trunk/sys/dev/sec/sec.h	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sec/sec.h	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
  * All rights reserved.
@@ -22,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/sec/sec.h 235938 2012-05-24 21:24:23Z raj $
  */
 
 #ifndef	_SEC_H
@@ -46,6 +47,7 @@
 /* SEC information */
 #define SEC_20_ID			0x0000000000000040ULL
 #define SEC_30_ID			0x0030030000000000ULL
+#define SEC_31_ID			0x0030030100000000ULL
 #define SEC_CHANNELS			4
 #define SEC_POINTERS			7
 #define SEC_MAX_DMA_BLOCK_SIZE		0xFFFF

Modified: trunk/sys/dev/sf/if_sf.c
===================================================================
--- trunk/sys/dev/sf/if_sf.c	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sf/if_sf.c	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul at ctr.columbia.edu>.  All rights reserved.
@@ -31,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/sf/if_sf.c 243857 2012-12-04 09:32:43Z glebius $");
 
 /*
  * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
@@ -1984,7 +1985,6 @@
 sf_init_locked(struct sf_softc *sc)
 {
 	struct ifnet		*ifp;
-	struct mii_data		*mii;
 	uint8_t			eaddr[ETHER_ADDR_LEN];
 	bus_addr_t		addr;
 	int			i;
@@ -1993,7 +1993,6 @@
 	ifp = sc->sf_ifp;
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
 		return;
-	mii = device_get_softc(sc->sf_miibus);
 
 	sf_stop(sc);
 	/* Reset the hardware to a known state. */

Modified: trunk/sys/dev/sf/if_sfreg.h
===================================================================
--- trunk/sys/dev/sf/if_sfreg.h	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sf/if_sfreg.h	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul at ctr.columbia.edu>.  All rights reserved.
@@ -29,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/sf/if_sfreg.h 232203 2012-02-27 08:55:32Z kevlo $
  */
 
 /*
@@ -352,7 +353,7 @@
 
 #define SF_INTRS	\
 	(SF_IMR_RXDQ2_NOBUFS|SF_IMR_RXDQ1_DMADONE|SF_IMR_RXDQ2_DMADONE|	\
-	 SF_IMR_TX_DMADONE|SF_IMR_RXDQ1_NOBUFS|SF_IMR_RXDQ2_DMADONE|	\
+	 SF_IMR_TX_DMADONE|SF_IMR_RXDQ1_NOBUFS|				\
 	 SF_IMR_NORMALINTR|SF_IMR_ABNORMALINTR|SF_IMR_TXCQ_NOBUFS|	\
 	 SF_IMR_RXCQ1_NOBUFS|SF_IMR_RXCQ2_NOBUFS|SF_IMR_STATSOFLOW|	\
 	 SF_IMR_TX_LOFIFO|SF_IMR_DMAERR|SF_IMR_RXGFP_NORESP|		\

Modified: trunk/sys/dev/sf/starfire_rx.h
===================================================================
--- trunk/sys/dev/sf/starfire_rx.h	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sf/starfire_rx.h	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,4 +1,5 @@
 /* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/sf/starfire_rx.h 175524 2008-01-21 05:02:44Z yongari $ */
 /*
  *   MODULE: GFP_RX.H
  *

Modified: trunk/sys/dev/sf/starfire_tx.h
===================================================================
--- trunk/sys/dev/sf/starfire_tx.h	2018-05-27 23:11:35 UTC (rev 10069)
+++ trunk/sys/dev/sf/starfire_tx.h	2018-05-27 23:11:47 UTC (rev 10070)
@@ -1,4 +1,5 @@
 /* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/sf/starfire_tx.h 175525 2008-01-21 05:09:07Z yongari $ */
 /*
  *   MODULE: GFP_TX.H
  *