 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $ */
+/*	$NetBSD: autoconf.c,v 1.6 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,42 +51,42 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2012/07/29 18:05:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2021/03/29 13:14:13 rin Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device_if.h>
 #include <sys/systm.h>
 #include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 /* List of port-specific devices to attach to the processor local bus. */
-static const struct plb_dev local_plb_devs [] = {
+static struct plb_dev local_plb_devs [] = {
 	{ XILVIRTEX, "xcvbus" },
 	{ 0, NULL }
 };
 /*
  * Determine device configuration for a machine.
  */
 void
 cpu_configure(void)
+{
 	intr_init();
 	calc_delayconst();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */
+/*	$NetBSD: consinit.c,v 1.4 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,48 +23,47 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF 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.
  */
 #include "opt_cons.h"
 #include "xlcom.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.4 2021/03/29 13:14:13 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <evbppc/virtex/virtex.h>
 #include <dev/cons.h>
 #if NXLCOM > 0
 extern struct consdev 	consdev_xlcom;
 void    		xlcom_cninit(struct consdev *, bus_addr_t);
 #if defined(KGDB)
 void 			xlcom_kgdbinit(void);
 #endif
 #endif
 struct consdev 		*cn_tab = NULL;
 bus_space_tag_t 	consdev_iot;
 bus_space_handle_t 	consdev_ioh;
 #if defined(KGDB)
 bus_space_tag_t 	kgdb_iot;
 bus_space_handle_t 	kgdb_ioh;
 #endif
 /*
  * Initialize the system console (hmm, as if anyone can see those panics).
  */
 void

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: design_gsrd2.c,v 1.4 2011/06/18 06:44:27 matt Exp $ */
+/* 	$NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF 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.
  */
 #include "opt_virtex.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.4 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: design_gsrd2.c,v 1.5 2021/03/29 13:14:13 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <machine/powerpc.h>
 #include <machine/tlb.h>
 @@ -86,26 +86,27 @@ typedef struct cdmac_intrhand {
 	void 			(*cih_func)(void *);
 	void 			*cih_arg;
 } *cdmac_intrhand_t;
 /* Two instantiated channels, one logical interrupt per direction. */
 static struct cdmac_intrhand 	cdmacintr[CDMAC_NCHAN];
 static void 			*cdmac_ih;
 /*
  * DCR bus space leaf access routines.
  */
 #ifndef DESIGN_DFC
 static void
 tft0_write_4(bus_space_tag_t t, bus_space_handle_t h, uint32_t addr,
     uint32_t val)
+{
 	addr += h;
 	switch (addr) {
 	WCASE(DCR_TFT0_BASE, TFT_CTRL);
 	WCASE(DCR_TFT0_BASE, TFT_ADDR);
 	WDEAD(addr);
+	}
+}
 @@ -114,26 +115,27 @@ tft0_read_4(bus_space_tag_t t, bus_space
+{
 	uint32_t 		val;
 	addr += h;
 	switch (addr) {
 	RCASE(DCR_TFT0_BASE, TFT_CTRL);
 	RCASE(DCR_TFT0_BASE, TFT_ADDR);
 	RDEAD(addr);
+	}
 	return (val);
+}
 #endif /* !DESIGN_DFC */
 static void
 tft1_write_4(bus_space_tag_t t, bus_space_handle_t h, uint32_t addr,
     uint32_t val)
+{
 	addr += h;
 	switch (addr) {
 	WCASE(DCR_TFT1_BASE, TFT_CTRL);
 	WCASE(DCR_TFT0_BASE, TFT_ADDR);
 	WDEAD(addr);
+	}
+}
 @@ -222,29 +224,31 @@ temac_read_4(bus_space_tag_t t, bus_spac
+	}
 	return (val);
+}
 static const struct powerpc_bus_space cdmac_bst = {
 	DCR_BST_BODY(DCR_CDMAC_BASE, cdmac_read_4, cdmac_write_4)
 };
 static const struct powerpc_bus_space temac_bst = {
 	DCR_BST_BODY(DCR_TEMAC_BASE, temac_read_4, temac_write_4)
 };
 #ifndef DESIGN_DFC
 static const struct powerpc_bus_space tft0_bst = {
 	DCR_BST_BODY(DCR_TFT0_BASE, tft0_read_4, tft0_write_4)
 };
 #endif
 static const struct powerpc_bus_space tft1_bst = {
 	DCR_BST_BODY(DCR_TFT1_BASE, tft1_read_4, tft1_write_4)
 };
 static struct powerpc_bus_space opb_bst = {
 	.pbs_flags 	= _BUS_SPACE_BIG_ENDIAN|_BUS_SPACE_MEM_TYPE,
 	.pbs_base 	= 0 /*OPB_BASE*/,
 	.pbs_offset 	= OPB_BASE,
 };
 static char opb_extent_storage[EXTENT_FIXED_STORAGE_SIZE(8)] __aligned(8);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $ */
+/*	$NetBSD: machdep.c,v 1.26 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF 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.
  */
 /*
  * Based on Walnut and Explora.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2021/03/29 13:14:13 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_virtex.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/boot_flag.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 @@ -90,27 +90,26 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 /*
  * Global variables used here and there
  */
 struct vm_map *phys_map = NULL;
 /*
  * This should probably be in autoconf!				XXX
  */
 char machine[] = MACHINE;		/* from <machine/param.h> */
 char machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 char bootpath[256];
 vaddr_t msgbuf_vaddr;
 void initppc(vaddr_t, vaddr_t);
 static void dumpsys(void);
 /* BSS segment start & end. */
 extern char 		edata[], end[];
 /* One region holds all memory, the other is terminator expected by 405 pmap. */
 #define MEMREGIONS 	2
 struct mem_region 	physmemr[MEMREGIONS];
 struct mem_region 	availmemr[MEMREGIONS];

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: if_temac.c,v 1.16 2020/02/04 07:36:04 skrll Exp $ */
+/* 	$NetBSD: if_temac.c,v 1.17 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,27 +30,27 @@
  */
 /*
  * Driver for Xilinx LocalLink TEMAC as wired on the GSRD platform.
+ *
  * TODO:
  * 	- Optimize
  * 	- Checksum offload
  * 	- Address filters
  * 	- Support jumbo frames
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.16 2020/02/04 07:36:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.17 2021/03/29 13:14:13 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 @@ -220,27 +220,27 @@ static inline void 	temac_txcdsync(struc
 static void 		temac_txreap(struct temac_softc *);
 static void 		temac_rxreap(struct temac_softc *);
 static int 		temac_rxalloc(struct temac_softc *, int, int);
 static void 		temac_rxtimo(void *);
 static void 		temac_rxdrain(struct temac_softc *);
 static void 		temac_reset(struct temac_softc *);
 static void 		temac_txkick(struct temac_softc *);
 /* Register access. */
 static inline void 	gmi_write_8(uint32_t, uint32_t, uint32_t);
 static inline void 	gmi_write_4(uint32_t, uint32_t);
 static inline void 	gmi_read_8(uint32_t, uint32_t *, uint32_t *);
 static inline uint32_t 	gmi_read_4(uint32_t);
-static inline void 	hif_wait_stat(uint32_t);
+static inline int 	hif_wait_stat(uint32_t);
 #define cdmac_rx_stat(sc) \
     bus_space_read_4((sc)->sc_dma_rxt, (sc)->sc_dma_rsh, 0 /* XXX hack */)
 #define cdmac_rx_reset(sc)						      \
     bus_space_write_4((sc)->sc_dma_rxt, (sc)->sc_dma_rsh, 0, CDMAC_STAT_RESET)
 #define cdmac_rx_start(sc, val)						      \
     bus_space_write_4((sc)->sc_dma_rxt, (sc)->sc_dma_rxh, CDMAC_CURDESC, (val))
 #define cdmac_tx_stat(sc) \
     bus_space_read_4((sc)->sc_dma_txt, (sc)->sc_dma_tsh, 0 /* XXX hack */)
 @@ -1019,27 +1019,27 @@ temac_txreap(struct temac_softc *sc)
 	 * XXX we rely on that we make EXACTLY one batch per intr, no more
 	 */
 	while (sc->sc_txsfree != TEMAC_TXQLEN) {
 		txs = &sc->sc_txsoft[sc->sc_txsreap];
 		dmap = txs->txs_dmap;
 		sc->sc_txreap = TEMAC_TXINC(sc->sc_txreap, dmap->dm_nsegs);
 		sc->sc_txfree += dmap->dm_nsegs;
 		bus_dmamap_unload(sc->sc_dmat, txs->txs_dmap);
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
-		sc->sc_if.if_opackets++;
+		if_statinc(&sc->sc_if, if_opackets);
 		sent = 1;
 		sc->sc_txsreap = TEMAC_TXSNEXT(sc->sc_txsreap);
 		sc->sc_txsfree++;
 		if (txs->txs_last) {
 			txs->txs_last = 0;
 			sc->sc_txbusy = 0; 	/* channel stopped now */
 			temac_txkick(sc);
 			break;
+		}
+	}

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: tft_ll.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */
+/* 	$NetBSD: tft_ll.c,v 1.5 2021/03/29 13:14:13 rin Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1.5 2021/03/29 13:14:13 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -50,27 +50,29 @@ __KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1
 #include <dev/wscons/wsconsio.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #include <evbppc/virtex/dev/xcvbusvar.h>
 #include <evbppc/virtex/dev/cdmacreg.h>
 #include <evbppc/virtex/dev/tftreg.h>
 #include <evbppc/virtex/dev/tftvar.h>
 struct ll_tft_control {
 	struct cdmac_descr      cd_dsc;
 	u_char                  cd_img[];
-} __packed;
+};
 CTASSERT(offsetof(struct ll_tft_control, cd_img) == sizeof(struct cdmac_descr));
 struct ll_tft_softc {
 	struct tft_softc 	lsc_sc;
 	bus_space_tag_t 	lsc_dma_iot;
 	bus_space_handle_t 	lsc_dma_ioh;
 	bus_dma_tag_t 		lsc_dmat;
 	bus_dmamap_t 		lsc_dmap;
 	struct ll_tft_control 	*lsc_cd;
 	bus_dma_segment_t 	lsc_seg;
 };