 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootinfo.h,v 1.4 2007/10/17 19:56:56 garbled Exp $	*/
+/*	$NetBSD: bootinfo.h,v 1.5 2010/05/16 11:27:49 phx Exp $	*/
 /*
  * Copyright (c) 1997
  *	Matthias Drochner.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -32,26 +32,27 @@
 #define BOOTINFO_MAGIC	0xb007babe
 struct btinfo_common {
 	int next;		/* offset of next item, or zero */
 	int type;
 };
 #define BTINFO_MAGIC		1
 #define BTINFO_MEMORY		2
 #define BTINFO_CONSOLE		3
 #define BTINFO_CLOCK		4
 #define BTINFO_BOOTPATH		5
 #define BTINFO_ROOTDEVICE	6
 #define BTINFO_NET		7
 struct btinfo_magic {
 	struct btinfo_common common;
 	unsigned magic;
 };
 struct btinfo_memory {
 	struct btinfo_common common;
 	int memsize;
 };
 struct btinfo_console {
 	struct btinfo_common common;
 @@ -66,20 +67,26 @@ struct btinfo_clock {
 };
 struct btinfo_bootpath {
 	struct btinfo_common common;
 	char bootpath[80];
 };
 struct btinfo_rootdevice {
 	struct btinfo_common common;
 	char devname[16];
 	unsigned cookie;
 };
 struct btinfo_net {
 	struct btinfo_common common;
 	char devname[16];
 	uint8_t mac_address[6];
 };
 #define BOOTINFO_MAXSIZE 4096
 #ifdef _KERNEL
 void *lookup_bootinfo(int);
 #endif
 #endif	/* _MACHINE_BOOTINFO_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.19 2009/03/18 10:22:35 cegger Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.20 2010/05/16 11:27:49 phx Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * 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.
 @@ -25,88 +25,102 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
+ *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2009/03/18 10:22:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2010/05/16 11:27:49 phx Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <dev/cons.h>
 #include <dev/pci/pcivar.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <machine/bootinfo.h>
 #include <machine/pio.h>
 static struct btinfo_rootdevice *bi_rdev;
 static struct btinfo_bootpath *bi_path;
 static struct btinfo_net *bi_net;
 #include <dev/cons.h>
 #include <machine/pio.h>
 /*
  * Determine i/o configuration for a machine.
  */
 void
 cpu_configure(void)
+{
 	bi_rdev = lookup_bootinfo(BTINFO_ROOTDEVICE);
 	bi_path = lookup_bootinfo(BTINFO_BOOTPATH);
 	bi_net = lookup_bootinfo(BTINFO_NET);
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("configure: mainbus not configured");
 	genppc_cpu_configure();
+}
 char *booted_kernel; /* should be a genuine filename */
 void
 cpu_rootconf(void)
+{
 	if (bi_path != NULL)
 		booted_kernel = bi_path->bootpath;
 	aprint_normal("boot device: %s\n",
 	    booted_device ? booted_device->dv_xname : "<unknown>");
 	setroot(booted_device, booted_partition);
+}
 void
 device_register(struct device *dev, void *aux)
+{
 	struct pci_attach_args *pa;
-	if (bi_rdev == NULL)
+	if (dev->dv_class == DV_IFNET) {
-		return; /* no clue to determine */
+		pa = aux;
 		if (bi_rdev != NULL && device_is_a(dev, bi_rdev->devname)
-	if (dev->dv_class == DV_IFNET
+		    && bi_rdev->cookie == pa->pa_tag)
 	    && device_is_a(dev, bi_rdev->devname)) {
 		struct pci_attach_args *pa = aux;
 		if (bi_rdev->cookie == pa->pa_tag)
 			booted_device = dev;
 		if (bi_net != NULL && device_is_a(dev, bi_net->devname)) {
 			prop_data_t pd;
 			pd = prop_data_create_data_nocopy(bi_net->mac_address,
 			    ETHER_ADDR_LEN);
 			KASSERT(pd != NULL);
 			if (prop_dictionary_set(device_properties(dev),
 			    "mac-address", pd) == false)
 				printf("WARNING: unable to set mac-addr "
 				    "property for %s\n", dev->dv_xname);
 			prop_object_release(pd);
 			bi_net = NULL;	/* do it just once */
+		}
+	}
-	if (dev->dv_class == DV_DISK
+	if (bi_rdev != NULL && dev->dv_class == DV_DISK
 	    && device_is_a(dev, bi_rdev->devname)) {
 		booted_device = dev;
 		booted_partition = 0;
+	}
+}
 #if 0
 void
 findroot(void)
+{
 	int unit, part;
 	device_t dv;
 	const char *name;

 @@ -1,14 +1,14 @@
-/* $NetBSD: brdsetup.c,v 1.13 2010/05/13 10:40:02 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.14 2010/05/16 11:27:49 phx Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -697,13 +697,87 @@ pcifixup(void)
 		usb  = pcimaketag(0, 14, 1);
 		val = pcicfgread(usb, 0x3c) & 0xffff0000;
 		val |= (('B' - '@') << 8) | 14;
 		pcicfgwrite(usb, 0x3c, val);
 		usb  = pcimaketag(0, 14, 2);
 		val = pcicfgread(usb, 0x3c) & 0xffff0000;
 		val |= (('C' - '@') << 8) | 14;
 		pcicfgwrite(usb, 0x3c, val);
 		break;
+	}
+}
 struct fis_dir_entry {
 	char		name[16];
 	uint32_t	startaddr;
 	uint32_t	loadaddr;
 	uint32_t	flashsize;
 	uint32_t	entryaddr;
 	uint32_t	filesize;
 	char		pad[256 - (16 + 5 * sizeof(uint32_t))];
 };
 #define FIS_LOWER_LIMIT	0xfff00000
 /*
  * Look for a Redboot-style Flash Image System FIS-directory and
  * return a pointer to the start address of the requested file.
  */
 static void *
 redboot_fis_lookup(const char *filename)
+{
 	static const char FISdirname[16] = {
 	    'F', 'I', 'S', ' ',
 	    'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 0, 0, 0
 	};
 	struct fis_dir_entry *dir;
 	/*
 	 * The FIS directory is usually in the last sector of the flash.
 	 * But we do not know the sector size (erase size), so start
 	 * at 0xffffff00 and scan backwards in steps of the FIS directory
 	 * entry size (0x100).
 	 */
 	for (dir = (struct fis_dir_entry *)0xffffff00;
 	    (uint32_t)dir >= FIS_LOWER_LIMIT; dir--)
 		if (memcmp(dir->name, FISdirname, sizeof(FISdirname)) == 0)
 			break;
 	if ((uint32_t)dir < FIS_LOWER_LIMIT) {
 		printf("No FIS directory found!\n");
 		return NULL;
+	}
 	/* Now find filename by scanning the directory from beginning. */
 	dir = (struct fis_dir_entry *)dir->startaddr;
 	while (dir->name[0] != 0xff && (uint32_t)dir < 0xffffff00) {
 		if (strcmp(dir->name, filename) == 0)
 			return (void *)dir->startaddr;	/* found */
 		dir++;
+	}
 	printf("\"%s\" not found in FIS directory!\n", filename);
 	return NULL;
+}
 /*
  * For cost saving reasons some NAS boxes are missing the ROM for the
  * NIC's ethernet address and keep it in their Flash memory.
  */
 void
 read_mac_from_flash(uint8_t *mac)
+{
 	uint8_t *p;
 	if (brdtype == BRD_SYNOLOGY) {
 		p = redboot_fis_lookup("vendor");
 		if (p != NULL) {
 			memcpy(mac, p, 6);
 			return;
+		}
 	} else
 		printf("Warning: This board has no known method defined "
 		    "to determine its MAC address!\n");
 	/* set to 00:00:00:00:00:00 in case of error */
 	memset(mac, 0, 6);
+}

 @@ -1,38 +1,39 @@
-/* $NetBSD: globals.h,v 1.14 2010/05/08 19:41:07 phx Exp $ */
+/* $NetBSD: globals.h,v 1.15 2010/05/16 11:27:49 phx Exp $ */
 /* clock feed */
 #ifndef EXT_CLK_FREQ
 #define EXT_CLK_FREQ	33333333	/* external clock (PCI clock) */
 #endif
 /* brd type */
 extern int brdtype;
 #define BRD_SANDPOINTX2		2
 #define BRD_SANDPOINTX3		3
 #define BRD_ENCOREPP1		10
 #define BRD_KUROBOX		100
 #define BRD_QNAPTS101		101
 #define BRD_SYNOLOGY		102
 #define BRD_STORCENTER		103
 #define BRD_UNKNOWN		-1
 extern char *consname;
 extern int consport;
 extern int consspeed;
 extern int ticks_per_sec;
 extern uint32_t cpuclock, busclock;
 unsigned mpc107memsize(void);
 void read_mac_from_flash(uint8_t *);
 /* PPC processor ctl */
 void __syncicache(void *, size_t);
 /* byte swap access */
 void out16rb(unsigned, unsigned);
 void out32rb(unsigned, unsigned);
 unsigned in16rb(unsigned);
 unsigned in32rb(unsigned);
 void iohtole16(unsigned, unsigned);
 void iohtole32(unsigned, unsigned);
 unsigned iole32toh(unsigned);
 unsigned iole16toh(unsigned);

 @@ -1,14 +1,14 @@
-/* $NetBSD: main.c,v 1.28 2010/05/13 10:40:02 phx Exp $ */
+/* $NetBSD: main.c,v 1.29 2010/05/16 11:27:49 phx Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -59,26 +59,27 @@ char *consname = CONSNAME;
 int consport = CONSPORT;
 int consspeed = CONSSPEED;
 int ticks_per_sec;
 uint32_t busclock, cpuclock;
 void
 main(void)
+{
 	struct btinfo_memory bi_mem;
 	struct btinfo_console bi_cons;
 	struct btinfo_clock bi_clk;
 	struct btinfo_bootpath bi_path;
 	struct btinfo_rootdevice bi_rdev;
 	struct btinfo_net bi_net;
 	unsigned long marks[MARK_MAX];
 	unsigned lata[1][2], lnif[1][2];
 	unsigned memsize, tag;
 	int b, d, f, fd, howto, n;
 	/* determine SDRAM size */
 	memsize = mpc107memsize();
 	printf("\n");
 	printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev);
 	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 	switch (brdtype) {
 	case BRD_SANDPOINTX3:
 @@ -148,32 +149,39 @@ main(void)
 #endif
 	bootinfo = (void *)0x4000;
 	bi_init(bootinfo);
 	bi_mem.memsize = memsize;
 	snprintf(bi_cons.devname, sizeof(bi_cons.devname), consname);
 	bi_cons.addr = consport;
 	bi_cons.speed = consspeed;
 	bi_clk.ticks_per_sec = ticks_per_sec;
 	snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), bootfile);
 	snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), rootdev);
 	bi_rdev.cookie = tag; /* PCI tag for fxp netboot case */
 	if (brdtype == BRD_SYNOLOGY) {
 		/* need to set MAC address for Marvell-SKnet */
 		strcpy(bi_net.devname, "sk");
 		memcpy(bi_net.mac_address, en, sizeof(en));
+	}
 	bi_add(&bi_cons, BTINFO_CONSOLE, sizeof(bi_cons));
 	bi_add(&bi_mem, BTINFO_MEMORY, sizeof(bi_mem));
 	bi_add(&bi_clk, BTINFO_CLOCK, sizeof(bi_clk));
 	bi_add(&bi_path, BTINFO_BOOTPATH, sizeof(bi_path));
 	bi_add(&bi_rdev, BTINFO_ROOTDEVICE, sizeof(bi_rdev));
 	if (brdtype == BRD_SYNOLOGY)
 		bi_add(&bi_net, BTINFO_NET, sizeof(bi_net));
 	printf("entry=%p, ssym=%p, esym=%p\n",
 	    (void *)marks[MARK_ENTRY],
 	    (void *)marks[MARK_SYM],
 	    (void *)marks[MARK_END]);
 	__syncicache((void *)marks[MARK_ENTRY],
 	    (u_int)marks[MARK_SYM] - (u_int)marks[MARK_ENTRY]);
 	run((void *)marks[MARK_SYM], (void *)marks[MARK_END],
 	    (void *)howto, bootinfo, (void *)marks[MARK_ENTRY]);
 	/* should never come here */

 @@ -1,14 +1,14 @@
-/* $NetBSD: skg.c,v 1.2 2010/05/03 18:55:09 phx Exp $ */
+/* $NetBSD: skg.c,v 1.3 2010/05/16 11:27:49 phx Exp $ */
 /*-
  * Copyright (c) 2010 Frank Wille.
  * All rights reserved.
+ *
  * Written by Frank Wille for The NetBSD Project.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -217,45 +217,40 @@ skg_init(unsigned tag, void *data)
 	CSR_WRITE_2(l, SK_CSR, CSR_MASTER_RESET);
 	CSR_WRITE_2(l, SK_LINK_CTRL, LINK_RESET_SET);
 	DELAY(1000);
 	CSR_WRITE_2(l, SK_CSR, CSR_SW_UNRESET);
 	DELAY(2);
 	CSR_WRITE_2(l, SK_CSR, CSR_MASTER_UNRESET);
 	CSR_WRITE_2(l, SK_LINK_CTRL, LINK_RESET_CLEAR);
 	CSR_WRITE_4(l, SK_RAMCTL, 2);	/* enable RAM interface */
 	mii_initphy(l);
 	/* read ethernet address */
 	en = data;
-	for (i = 0; i < 6; i++)
+	if (brdtype == BRD_SYNOLOGY)
-		en[i] = CSR_READ_1(l, SK_MAC0 + i);
+		read_mac_from_flash(en);
 	else
 		for (i = 0; i < 6; i++)
 			en[i] = CSR_READ_1(l, SK_MAC0 + i);
 	printf("MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
 	    en[0], en[1], en[2], en[3], en[4], en[5]);
 	printf("PHY %d (%04x.%04x)\n", l->phy,
 	    mii_read(l, l->phy, 2), mii_read(l, l->phy, 3));
 	/* set station address */
-	for (i = 0; i < 3; i++) {
+	for (i = 0; i < 3; i++)
 #if 0
 		CSR_WRITE_2(l, YUKON_SA1 + i * 4,
 		    CSR_READ_2(l, SK_MAC0 + i * 2));
 		CSR_WRITE_2(l, YUKON_SA2 + i * 4,
 		    CSR_READ_2(l, SK_MAC1 + i * 2));
 #else
 		CSR_WRITE_2(l, YUKON_SA1 + i * 4,
 		    (en[i * 2] << 8) | en[i * 2 + 1]);
 #endif
 	/* configure RX and TX MAC FIFO */
 	CSR_WRITE_1(l, SK_RXMF1_CTRL_TEST, RFCTL_RESET_CLEAR);
 	CSR_WRITE_4(l, SK_RXMF1_CTRL_TEST, RFCTL_OPERATION_ON);
 	CSR_WRITE_1(l, SK_TXMF1_CTRL_TEST, TFCTL_RESET_CLEAR);
 	CSR_WRITE_4(l, SK_TXMF1_CTRL_TEST, TFCTL_OPERATION_ON);
 	mii_dealan(l, 5);
 	switch (PSSR_SPEED(l->pssr)) {
 	case SPEED1000:
 		printf("1000Mbps");
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sk.c,v 1.66 2010/04/05 07:20:27 joerg Exp $	*/
+/*	$NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -105,27 +105,27 @@
  * interface with DMA support. Each card may have between 512K and
  * 2MB of SRAM on board depending on the configuration.
+ *
  * The SysKonnect GEnesis controller can have either one or two XMAC
  * chips connected to it, allowing single or dual port NIC configurations.
  * SysKonnect has the distinction of being the only vendor on the market
  * with a dual port gigabit ethernet NIC. The GEnesis provides dual FIFOs,
  * dual DMA queues, packet/MAC/transmit arbiters and direct access to the
  * XMAC registers. This driver takes advantage of these features to allow
  * both XMACs to operate as independent interfaces.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.66 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -1199,26 +1199,27 @@ sk_probe(device_t parent, cfdata_t match
  * Each XMAC chip is attached as a separate logical IP interface.
  * Single port cards will have only one logical interface of course.
  */
 void
 sk_attach(device_t parent, device_t self, void *aux)
+{
 	struct sk_if_softc *sc_if = device_private(self);
 	struct sk_softc *sc = device_private(parent);
 	struct skc_attach_args *sa = aux;
 	struct sk_txmap_entry	*entry;
 	struct ifnet *ifp;
 	bus_dma_segment_t seg;
 	bus_dmamap_t dmamap;
 	prop_data_t data;
 	void *kva;
 	int i, rseg;
 	int mii_flags = 0;
 	aprint_naive("\n");
 	sc_if->sk_dev = self;
 	sc_if->sk_port = sa->skc_port;
 	sc_if->sk_softc = sc;
 	sc->sk_if[sa->skc_port] = sc_if;
 	if (sa->skc_port == SK_PORT_A)
 		sc_if->sk_tx_bmu = SK_BMU_TXS_CSR0;
 @@ -1226,30 +1227,40 @@ sk_attach(device_t parent, device_t self
 		sc_if->sk_tx_bmu = SK_BMU_TXS_CSR1;
 	DPRINTFN(2, ("begin sk_attach: port=%d\n", sc_if->sk_port));
 	/*
 	 * Get station address for this interface. Note that
 	 * dual port cards actually come with three station
 	 * addresses: one for each port, plus an extra. The
 	 * extra one is used by the SysKonnect driver software
 	 * as a 'virtual' station address for when both ports
 	 * are operating in failover mode. Currently we don't
 	 * use this extra address.
 	 */
-	for (i = 0; i < ETHER_ADDR_LEN; i++)
+	data = prop_dictionary_get(device_properties(self), "mac-address");
-		sc_if->sk_enaddr[i] =
+	if (data != NULL) {
-			sk_win_read_1(sc, SK_MAC0_0 + (sa->skc_port * 8) + i);
+		/*
 		 * Try to get the station address from device properties
 		 * first, in case the ROM is missing.
 		 */
 		KASSERT(prop_object_type(data) == PROP_TYPE_DATA);
 		KASSERT(prop_data_size(data) == ETHER_ADDR_LEN);
 		memcpy(sc_if->sk_enaddr, prop_data_data_nocopy(data),
 		    ETHER_ADDR_LEN);
 	} else
 		for (i = 0; i < ETHER_ADDR_LEN; i++)
 			sc_if->sk_enaddr[i] = sk_win_read_1(sc,
 			    SK_MAC0_0 + (sa->skc_port * 8) + i);
 	aprint_normal(": Ethernet address %s\n",
 	    ether_sprintf(sc_if->sk_enaddr));
 	/*
 	 * Set up RAM buffer addresses. The NIC will have a certain
 	 * amount of SRAM on it, somewhere between 512K and 2MB. We
 	 * need to divide this up a) between the transmitter and
  	 * 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.
 	 */
 	if (sk_win_read_1(sc, SK_CONFIG) & SK_CONFIG_SINGLEMAC) {