Thu Oct 20 04:06:53 2016 UTC ()

Add more DPRINTF()s.


(msaitoh)

diff -r1.420 -r1.421 src/sys/dev/pci/if_wm.c

--- src/sys/dev/pci/if_wm.c 2016/10/19 08:55:23	1.420
+++ src/sys/dev/pci/if_wm.c 2016/10/20 04:06:53	1.421

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.420 2016/10/19 08:55:23 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.421 2016/10/20 04:06:53 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -74,27 +74,27 @@
+ *
  *	- Check XXX'ed comments
  *	- Disable D0 LPLU on 8257[12356], 82580 and I350.
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Advanced Receive Descriptor
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.420 2016/10/19 08:55:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.421 2016/10/20 04:06:53 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -10037,26 +10037,29 @@ wm_nvm_set_addrbits_size_eecd(struct wm_
+}
 /*
  * wm_nvm_ready_spi:
+ *
  *	Wait for a SPI EEPROM to be ready for commands.
  */
 static int
 wm_nvm_ready_spi(struct wm_softc *sc)
+{
 	uint32_t val;
 	int usec;
 	DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
 		device_xname(sc->sc_dev), __func__));
 	for (usec = 0; usec < SPI_MAX_RETRIES; delay(5), usec += 5) {
 		wm_eeprom_sendbits(sc, SPI_OPC_RDSR, 8);
 		wm_eeprom_recvbits(sc, &val, 8);
 		if ((val & SPI_SR_RDY) == 0)
 			break;
+	}
 	if (usec >= SPI_MAX_RETRIES) {
 		aprint_error_dev(sc->sc_dev,"EEPROM failed to become ready\n");
 		return 1;
+	}
 	return 0;
+}
 @@ -10638,26 +10641,29 @@ wm_nvm_read_word_invm(struct wm_softc *s
 				break;
+			}
+		}
+	}
 	return rv;
+}
 static int
 wm_nvm_read_invm(struct wm_softc *sc, int offset, int words, uint16_t *data)
+{
 	int rv = 0;
 	int i;
 	DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
 		device_xname(sc->sc_dev), __func__));
 	for (i = 0; i < words; i++) {
 		switch (offset + i) {
 		case NVM_OFF_MACADDR:
 		case NVM_OFF_MACADDR1:
 		case NVM_OFF_MACADDR2:
 			rv = wm_nvm_read_word_invm(sc, offset + i, &data[i]);
 			if (rv != 0) {
 				data[i] = 0xffff;
 				rv = -1;
+			}
 			break;
 		case NVM_OFF_CFG2:
 @@ -11076,26 +11082,29 @@ wm_nvm_read(struct wm_softc *sc, int wor
+}
 /*
  * Hardware semaphores.
  * Very complexed...
  */
 static int
 wm_get_swsm_semaphore(struct wm_softc *sc)
+{
 	int32_t timeout;
 	uint32_t swsm;
 	DPRINTF(WM_DEBUG_NVM, ("%s: %s called\n",
 		device_xname(sc->sc_dev), __func__));
 	if (sc->sc_flags & WM_F_LOCK_SWSM) {
 		/* Get the SW semaphore. */
 		timeout = sc->sc_nvm_wordsize + 1;
 		while (timeout) {
 			swsm = CSR_READ(sc, WMREG_SWSM);
 			if ((swsm & SWSM_SMBI) == 0)
 				break;
 			delay(50);
 			timeout--;
+		}