Nabble - freebsd-arm

[changes-kw2ndif.diff]
Index: arm/mv/kirkwood/kirkwood.c

===================================================================

--- arm/mv/kirkwood/kirkwood.c	(revision 198539)

+++ arm/mv/kirkwood/kirkwood.c	(working copy)

@@ -95,6 +95,12 @@

 		{ -1 },

 		CPU_PM_CTRL_GE0

 	},

+        { "mge", MV_ETH1_BASE, MV_ETH_SIZE,

+                { MV_INT_GBE1RX, MV_INT_GBE1TX, MV_INT_GBE1MISC,

+                  MV_INT_GBE1SUM, MV_INT_GBEERR, -1 },

+                { -1 },

+                CPU_PM_CTRL_GE1

+        },

 	{ "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE,

 		{ -1 }, { -1 },

 		CPU_PM_CTRL_NONE

Index: arm/conf/DB-88F6XXX

===================================================================

--- arm/conf/DB-88F6XXX	(revision 198539)

+++ arm/conf/DB-88F6XXX	(working copy)

@@ -39,12 +39,12 @@

 # Debugging

 options 	ALT_BREAK_TO_DEBUGGER

 options 	DDB

-options 	DIAGNOSTIC

+#options 	DIAGNOSTIC

 #options 	INVARIANTS		#Enable calls of extra sanity checking

 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS

 options 	KDB

-options 	WITNESS			#Enable checks to detect deadlocks and cycles

-options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed

+#options 	WITNESS			#Enable checks to detect deadlocks and cycles

+#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed

 #options 	WITNESS_KDB

 

 device		pci

Index: conf/NOTES

===================================================================

--- conf/NOTES	(revision 198539)

+++ conf/NOTES	(working copy)

@@ -266,12 +266,12 @@

 #	  a lock hierarchy violation occurs or if locks are held when going to

 #	  sleep.

 # WITNESS_SKIPSPIN disables the witness checks on spin mutexes.

-options 	PREEMPTION

-options 	FULL_PREEMPTION

-options 	MUTEX_DEBUG

-options 	WITNESS

-options 	WITNESS_KDB

-options 	WITNESS_SKIPSPIN

+#options 	PREEMPTION

+#options 	FULL_PREEMPTION

+#options 	MUTEX_DEBUG

+#options 	WITNESS

+#options 	WITNESS_KDB

+#options 	WITNESS_SKIPSPIN

 

 # LOCK_PROFILING - Profiling locks.  See LOCK_PROFILING(9) for details.

 options 	LOCK_PROFILING

Index: dev/mge/if_mge.c

===================================================================

--- dev/mge/if_mge.c	(revision 198785)

+++ dev/mge/if_mge.c	(working copy)

@@ -685,6 +685,7 @@

 	ether_ifattach(ifp, hwaddr);

 	callout_init(&sc->wd_callout, 0);

 

+	device_printf( dev, "Now probing PHY\n" );

 	/* Probe PHY(s) */

 	error = mii_phy_probe(dev, &sc->miibus, mge_ifmedia_upd, mge_ifmedia_sts);

 	if (error) {

@@ -1273,10 +1274,11 @@

 	 * unit.

 	 */

 

-	

+

 	if ((MII_ADDR_BASE + device_get_unit(dev)) != phy)

 		return (0);

 

+

 	MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff &

 	    (MGE_SMI_READ | (reg << 21) | (phy << 16)));

 

@@ -1298,6 +1300,7 @@

 	if ((MII_ADDR_BASE + device_get_unit(dev)) != phy)

 		return (0);

 

+	device_printf( dev, "Writing %x to reg %x on phy %x\n", value, reg, phy );

 	MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff &

 	    (MGE_SMI_WRITE | (reg << 21) | (phy << 16) | (value & 0xffff)));

 

Index: dev/mii/e1000phy.c

===================================================================

--- dev/mii/e1000phy.c	(revision 198539)

+++ dev/mii/e1000phy.c	(working copy)

@@ -119,7 +119,7 @@

 static int

 e1000phy_probe(device_t	dev)

 {

-

+  device_printf( dev, "Probing e1000 PHY\n" );

 	return (mii_phy_dev_probe(dev, e1000phys, BUS_PROBE_DEFAULT));

 }

 

Index: dev/mii/mii.c

===================================================================

--- dev/mii/mii.c	(revision 198539)

+++ dev/mii/mii.c	(working copy)

@@ -124,7 +124,9 @@

 	int			bmsr, capmask = 0xFFFFFFFF;

 

 	mii = device_get_softc(dev);

+	device_printf( dev, "(miibus_probe) is the mii device\n" );

 	parent = device_get_parent(dev);

+	device_printf( parent, "(miibus_probe) is the eth device\n" );

 	LIST_INIT(&mii->mii_phys);

 

 	for (ma.mii_phyno = 0; ma.mii_phyno < MII_NPHY; ma.mii_phyno++) {

@@ -133,13 +135,15 @@

 		 * many braindead PHYs report 0/0 in their ID registers,

 		 * so we test for media in the BMSR.

 	 	 */

+  	        device_printf( dev, "Probing phy %x ", ma.mii_phyno );

 		bmsr = MIIBUS_READREG(parent, ma.mii_phyno, MII_BMSR);

-		if (bmsr == 0 || bmsr == 0xffff ||

+		if (bmsr == 0 ||

 		    (bmsr & (BMSR_EXTSTAT|BMSR_MEDIAMASK)) == 0) {

 			/* Assume no PHY at this address. */

-			continue;

+		  device_printf( dev, "No phy found\n" );

+		  continue;

 		}

-

+		device_printf( dev, "found one. Now looking for ID\n" );

 		/*

 		 * Extract the IDs. Braindead PHYs will be handled by

 		 * the `ukphy' driver, as we have no ID information to

@@ -179,6 +183,7 @@

 	 * Note that each NIC's softc must start with an ifnet pointer.

 	 * XXX: EVIL HACK!

 	 */

+	device_printf( dev, "miibus_attach\n" );

 	mii->mii_ifp = *(struct ifnet**)device_get_softc(device_get_parent(dev));

 	ivars = device_get_ivars(dev);

 	ifmedia_init(&mii->mii_media, IFM_IMASK, ivars->ifmedia_upd,

@@ -337,13 +342,16 @@

 	*child = device_add_child(dev, "miibus", -1);

 	device_set_ivars(*child, ivars);

 

+	device_printf( dev, "mii_phy_probe: Starting to probe PHYs: " );

 	for (i = 0; i < MII_NPHY; i++) {

 		bmsr = MIIBUS_READREG(dev, i, MII_BMSR);

-                if (bmsr == 0 || bmsr == 0xffff ||

+	        printf( "%d:%d ", i, bmsr );

+                if (bmsr == 0 ||

                     (bmsr & (BMSR_EXTSTAT|BMSR_MEDIAMASK)) == 0) {

                         /* Assume no PHY at this address. */

                         continue;

                 } else

+	 	        printf( "ok\n" );

 			break;

 	}

 




Nabble - freebsd-arm

Re: [PATCH] Fix a few nits in ate(4)

Re: [PATCH] Fix a few nits in ate(4)

[PATCH] Fix a few nits in ate(4)

Current problem reports assigned to freebsd-arm@FreeBSD.org

Re: Eval board Marvell 78xxx (Discovery)

Eval board Marvell 78xxx (Discovery)

Re: SCHED_ULE?

Re: SCHED_ULE?

Marvell MV6281 OpenRD client mge1

Re: SCHED_ULE?

[head tinderbox] failure on arm/arm

Current problem reports assigned to freebsd-arm@FreeBSD.org

Re: SCHED_ULE?

SCHED_ULE?

New Arrival of REFURBISHED and NEW Computers & Laptops

Re: Marvell Kirkwood 6281 mge1 interface

Initarm function for the Beagleboard

Re: Marvell Kirkwood 6281 mge1 interface

Re: Marvell Kirkwood 6281 mge1 interface

Re: Marvell Kirkwood 6281 mge1 interface

Re: Marvell Kirkwood 6281 mge1 interface

Re: Marvell Kirkwood 6281 mge1 interface

Re: Marvell Kirkwood 6281 mge1 interface

Marvell Kirkwood 6281 mge1 interface

Current problem reports assigned to freebsd-arm@FreeBSD.org

Re: Can't boot Marvel Sheevaplug from USB

Re: Can't boot Marvel Sheevaplug from USB

Current problem reports assigned to freebsd-arm@FreeBSD.org

Re: junk/139958: alyfmagb

Re: junk/139949: rwpwzita

arm/139958: alyfmagb

arm/139949: rwpwzita

Re: [ARM+NFS] panic while copying across NFS

Re: [ARM+NFS] panic while copying across NFS

Re: [ARM+NFS] panic while copying across NFS