svn commit: r315981 - head/sys/dev/iwn

[Hartmann, O.]

On Sun, 26 Mar 2017 09:10:02 +0000 (UTC)
Andriy Voskoboinyk <avos at FreeBSD.org> wrote:

> Author: avos
> Date: Sun Mar 26 09:10:01 2017
> New Revision: 315981
> URL: https://svnweb.freebsd.org/changeset/base/315981
> 
> Log:
>   iwn: omit unneeded bus_dmamap_sync() calls when compiled without
>   'options IWN_DEBUG'
> 
> Modified:
>   head/sys/dev/iwn/if_iwn.c
> 
> Modified: head/sys/dev/iwn/if_iwn.c
> ==============================================================================
> --- head/sys/dev/iwn/if_iwn.c	Sun Mar 26 08:54:08 2017
> (r315980) +++ head/sys/dev/iwn/if_iwn.c	Sun Mar 26 09:10:01
> 2017	(r315981) @@ -3944,6 +3944,7 @@ iwn_notif_intr(struct
> iwn_softc *sc) sc->errptr = le32toh(uc->errptr);
>  			break;
>  		}
> +#ifdef IWN_DEBUG
>  		case IWN_STATE_CHANGED:
>  		{
>  			/*
> @@ -3953,27 +3954,26 @@ iwn_notif_intr(struct iwn_softc *sc)
>  			 */
>  			bus_dmamap_sync(sc->rxq.data_dmat, data->map,
>  			    BUS_DMASYNC_POSTREAD);
> -#ifdef	IWN_DEBUG
> +
>  			uint32_t *status = (uint32_t *)(desc + 1);
>  			DPRINTF(sc, IWN_DEBUG_INTR | IWN_DEBUG_STATE,
>  			    "state changed to %x\n",
>  			    le32toh(*status));
> -#endif
>  			break;
>  		}
>  		case IWN_START_SCAN:
>  		{
>  			bus_dmamap_sync(sc->rxq.data_dmat, data->map,
>  			    BUS_DMASYNC_POSTREAD);
> -#ifdef	IWN_DEBUG
> +
>  			struct iwn_start_scan *scan =
>  			    (struct iwn_start_scan *)(desc + 1);
>  			DPRINTF(sc, IWN_DEBUG_ANY,
>  			    "%s: scanning channel %d status %x\n",
>  			    __func__, scan->chan,
> le32toh(scan->status)); -#endif
>  			break;
>  		}
> +#endif
>  		case IWN_STOP_SCAN:
>  		{
>  			bus_dmamap_sync(sc->rxq.data_dmat, data->map,
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe at freebsd.org"

It seems when iwm is configured in a kernel without debugging enabled,
builkernel failsas shown below:




 [...]
--------------------------------------------------------------
>>> stage 3.1: building everything
--------------------------------------------------------------
cd /usr/obj/usr/src/sys/HERMANN; COMPILER_VERSION=40000
COMPILER_TYPE=clang  COMPILER_FREEBSD_VERSION=1200006
MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64  MACHINE=amd64
CPUTYPE=native BUILD_TOOLS_META=.NOMETA_CMP
GROFF_BIN_PATH=/usr/obj/usr/src/tmp/legacy/usr/bin
GROFF_FONT_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/groff_font
GROFF_TMAC_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/tmac CC="cc
-target x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
-B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  -target
x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
-B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target
x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
-B/usr/obj/usr/src/tmp/usr/bin"  AS="as" AR="ar" LD="ld" LLVM_LINK=""
NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
INSTALL="sh /usr/src/tools/install.sh"
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/sbin:/bin:/usr/sbin:/usr/bin
make  -m /usr/src/share/mk  KERNEL=kernel all -DNO_MODULES_OBJ
Building /usr/obj/usr/src/sys/HERMANN/if_iwm_scan.o /usr/src/sys/dev/iwm/if_iwm_scan.c:224:12:
error: unused variable 'aborted' [-Werror,-Wunused-variable] boolean_t
aborted = (scan_notif->status == IWM_SCAN_OFFLOAD_ABORTED);
^ /usr/src/sys/dev/iwm/if_iwm_scan.c:251:11: error: unused variable
'uid' [-Werror,-Wunused-variable] uint32_t uid = le32toh(notif->uid);